diff options
| -rw-r--r-- | mk/stage0.mk | 7 | ||||
| -rwxr-xr-x | src/etc/get-snapshot.py | 2 | ||||
| -rw-r--r-- | src/etc/snapshot.py | 9 | ||||
| -rw-r--r-- | src/snapshots.txt | 5 |
4 files changed, 8 insertions, 15 deletions
diff --git a/mk/stage0.mk b/mk/stage0.mk index 2d0b9fe3c6c..c35fbfa3352 100644 --- a/mk/stage0.mk +++ b/mk/stage0.mk @@ -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. diff --git a/src/etc/get-snapshot.py b/src/etc/get-snapshot.py index aa64a4fb49a..98e480defda 100755 --- a/src/etc/get-snapshot.py +++ b/src/etc/get-snapshot.py @@ -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) diff --git a/src/etc/snapshot.py b/src/etc/snapshot.py index 8d789477c26..bacdc36a6e3 100644 --- a/src/etc/snapshot.py +++ b/src/etc/snapshot.py @@ -15,15 +15,6 @@ download_url_base = "http://dl.rust-lang.org/stage0-snapshots" 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"], diff --git a/src/snapshots.txt b/src/snapshots.txt index 751346075f5..30d8d2af5b0 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -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 |