Skip to content

Commit

Permalink
Register new snapshots
Browse files Browse the repository at this point in the history
Use main.o from the snapshot
  • Loading branch information
brson committed Aug 14, 2011
1 parent 83128f4 commit 25b85df
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 15 deletions.
7 changes: 2 additions & 5 deletions mk/stage0.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,8 @@ stage0/$(CFG_RUSTLLVM): stage0/rustc$(X)
stage0/lib/glue.o: stage0/rustc$(X)
$(Q)touch $@

# FIXME: temporary hack: currently not distributing main.o like we should;
# copying from rt

stage0/lib/main.o: rt/main.o
$(Q)cp $< $@
stage0/lib/main.o: stage0/rustc$(X)
$(Q)touch $@

# Instantiate template (in stageN.mk) for building
# stage0/lib/$(CFG_STDLIB) and stage0/lib/libstd.rlib.
Expand Down
2 changes: 1 addition & 1 deletion src/etc/get-snapshot.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def unpack_snapshot(snap):
print("opening snapshot " + dl_path)
tar = tarfile.open(dl_path)
kernel = get_kernel()
for name in old_snapshot_files[kernel]:
for name in snapshot_files[kernel]:
p = "rust-stage0/" + name
fp = os.path.join("stage0", name)
print("extracting " + fp)
Expand Down
9 changes: 0 additions & 9 deletions src/etc/snapshot.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@ def scrub(b):
download_dir_base = "dl"
download_unpack_base = os.path.join(download_dir_base, "unpack")

old_snapshot_files = {
"linux": ["rustc", "lib/glue.o", "lib/libstd.so",
"librustrt.so", "librustllvm.so", "lib/intrinsics.bc"],
"macos": ["rustc", "lib/glue.o", "lib/libstd.dylib",
"librustrt.dylib", "librustllvm.dylib", "lib/intrinsics.bc"],
"winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll",
"rustrt.dll", "rustllvm.dll", "lib/intrinsics.bc"]
}

snapshot_files = {
"linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/main.o",
"librustrt.so", "librustllvm.so", "lib/intrinsics.bc"],
Expand Down
5 changes: 5 additions & 0 deletions src/snapshots.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
S 2011-08-14 83128f4
linux-i386 8074d0b9d2a2f5084e4920a72262af28d0521b66
macos-i386 8e52161f00f24de345d727a1671bb20597165687
winnt-i386 0a4b419ed326b9da80a93d6d23db24a40bb37c8b

S 2011-08-09 e5533a5
linux-i386 6fedd9943689fa3457e77e62d0f8b100fecfe69c
macos-i386 f87e7dc9d27856ee39eea9a2c44b6b4d25113ac5
Expand Down

0 comments on commit 25b85df

Please sign in to comment.