Skip to content

Commit c62a9fe

Browse files
committed
Grab librustrt.so instead of lib/librustrt.so in the snapshot.
1 parent 075a094 commit c62a9fe

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/etc/get-snapshot.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def unpack_snapshot(snap):
99
print("opening snapshot " + dl_path)
1010
tar = tarfile.open(dl_path)
1111
kernel = get_kernel()
12-
for name in snapshot_files[kernel]:
12+
for name in old_snapshot_files[kernel]:
1313
p = "rust-stage0/" + name
1414
fp = os.path.join("stage0", name)
1515
print("extracting " + fp)

src/etc/snapshot.py

+8
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ def scrub(b):
1616
download_unpack_base = os.path.join(download_dir_base, "unpack")
1717

1818
snapshot_files = {
19+
"linux": ["rustc", "lib/glue.o", "lib/libstd.so",
20+
"librustrt.so", "librustllvm.so", "lib/intrinsics.bc"],
21+
"macos": ["rustc", "lib/glue.o", "lib/libstd.dylib",
22+
"librustrt.dylib", "librustllvm.dylib", "lib/intrinsics.bc"],
23+
"winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll",
24+
"rustrt.dll", "rustllvm.dll", "lib/intrinsics.bc"]
25+
}
26+
old_snapshot_files = {
1927
"linux": ["rustc", "lib/glue.o", "lib/libstd.so",
2028
"lib/librustrt.so", "librustllvm.so", "lib/intrinsics.bc"],
2129
"macos": ["rustc", "lib/glue.o", "lib/libstd.dylib",

0 commit comments

Comments
 (0)