From c62a9fec775a2f0fba5980fb13329bed57a1b118 Mon Sep 17 00:00:00 2001 From: Michael Sullivan Date: Thu, 21 Jul 2011 16:08:56 -0700 Subject: [PATCH] Grab librustrt.so instead of lib/librustrt.so in the snapshot. --- src/etc/get-snapshot.py | 2 +- src/etc/snapshot.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/etc/get-snapshot.py b/src/etc/get-snapshot.py index 98e480defda1..aa64a4fb49a1 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 snapshot_files[kernel]: + for name in old_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 54d25b7f9aba..43742fddecff 100644 --- a/src/etc/snapshot.py +++ b/src/etc/snapshot.py @@ -16,6 +16,14 @@ download_dir_base = "dl" download_unpack_base = os.path.join(download_dir_base, "unpack") 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"] + } +old_snapshot_files = { "linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/librustrt.so", "librustllvm.so", "lib/intrinsics.bc"], "macos": ["rustc", "lib/glue.o", "lib/libstd.dylib",