diff --git a/mk/stage0.mk b/mk/stage0.mk index 7450bf9bad0d..658ae63f4f59 100644 --- a/mk/stage0.mk +++ b/mk/stage0.mk @@ -14,7 +14,7 @@ stage0/lib/$(CFG_STDLIB): stage0/rustc$(X) stage0/intrinsics.bc: stage0/rustc$(X) $(Q)touch $@ -stage0/lib/$(CFG_RUSTLLVM): stage0/rustc$(X) +stage0/$(CFG_RUSTLLVM): stage0/rustc$(X) $(Q)touch $@ stage0/lib/$(CFG_RUNTIME): stage0/rustc$(X) diff --git a/src/etc/get-snapshot.py b/src/etc/get-snapshot.py index aa64a4fb49a1..98e480defda1 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 e3ba1d1a452f..82d423ce2fdd 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", "lib/libstd.rlib", - "lib/librustrt.so", "lib/librustllvm.so", "intrinsics.bc"], - "macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/libstd.rlib", - "lib/librustrt.dylib", "lib/librustllvm.dylib", "intrinsics.bc"], - "winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll", "lib/libstd.rlib", - "lib/rustrt.dll", "lib/rustllvm.dll", "intrinsics.bc"] - } - snapshot_files = { "linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib", "lib/librustrt.so", "librustllvm.so", "intrinsics.bc"], diff --git a/src/snapshots.txt b/src/snapshots.txt index 38ff50d9d003..651155042307 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,8 @@ +S 2011-07-11 a84310a + linux-i386 18e6caa490241d63ede86d289e6553bfa1c58953 + macos-i386 e775077d87e508020d8e0282f944d66c89cae630 + winnt-i386 5f428071e8dbacbf641e5ef006f3e9db51fd3ee8 + S 2011-07-11 f666c97 linux-i386 434346526e3feecf80ceb58f132fb4ea6cbfec0a macos-i386 f643f88b1414bf43c1821a9d3eea0bdc8df2f68d