Skip to content

Commit e4aa73c

Browse files
committed
Change snapshot script to pick up host libcore as well.
1 parent 81f932e commit e4aa73c

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

src/etc/get-snapshot.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ def unpack_snapshot(triple, snap):
1010
tar = tarfile.open(dl_path)
1111
kernel = get_kernel(triple)
1212
for name in snapshot_files[kernel]:
13+
# FIXME: temporary hack to make transition, remove soon.
14+
if "core" in name:
15+
continue
1316
p = "rust-stage0/" + name
1417
stagep = os.path.join(triple, "stage0")
1518
fp = os.path.join(stagep, name)

src/etc/snapshot.py

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,21 @@ def scrub(b):
1616
download_unpack_base = os.path.join(download_dir_base, "unpack")
1717

1818
snapshot_files = {
19-
"linux": ["bin/rustc", "lib/libruststd.so",
20-
"lib/librustrt.so", "lib/librustllvm.so"],
21-
"macos": ["bin/rustc", "lib/libruststd.dylib",
22-
"lib/librustrt.dylib", "lib/librustllvm.dylib"],
23-
"winnt": ["bin/rustc.exe", "lib/ruststd.dll",
24-
"lib/rustrt.dll", "lib/rustllvm.dll"]
19+
"linux": ["bin/rustc",
20+
"lib/libcore.so",
21+
"lib/libruststd.so",
22+
"lib/librustrt.so",
23+
"lib/librustllvm.so"],
24+
"macos": ["bin/rustc",
25+
"lib/libcore.dylib",
26+
"lib/libruststd.dylib",
27+
"lib/librustrt.dylib",
28+
"lib/librustllvm.dylib"],
29+
"winnt": ["bin/rustc.exe",
30+
"lib/core.dll",
31+
"lib/ruststd.dll",
32+
"lib/rustrt.dll",
33+
"lib/rustllvm.dll"]
2534
}
2635

2736
def parse_line(n, line):

0 commit comments

Comments
 (0)