Skip to content

Commit 15a670a

Browse files
committed
Use new snapshot.
1 parent 64ad592 commit 15a670a

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

mk/stage0.mk

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,5 @@ stage0/lib/glue.o: stage0/rustc$(X)
1111
stage0/lib/$(CFG_STDLIB): stage0/rustc$(X)
1212
$(Q)touch $@
1313

14-
# TODO: Include as part of the snapshot.
15-
stage0/intrinsics.bc: $(INTRINSICS_BC)
16-
@$(call E, cp: $@)
17-
$(Q)cp $< $@
18-
14+
stage0/intrinsics.bc: stage0/rustc$(X)
15+
$(Q)touch $@

src/etc/get-snapshot.py

Lines changed: 1 addition & 1 deletion
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 old_snapshot_files[kernel]:
12+
for name in snapshot_files[kernel]:
1313
p = "rust-stage0/" + name
1414
fp = os.path.join("stage0", name)
1515
print("extracting " + fp)

src/etc/snapshot.py

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

18-
old_snapshot_files = {
19-
"linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib",
20-
"lib/librustrt.so", "lib/librustllvm.so"],
21-
"macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/libstd.rlib",
22-
"lib/librustrt.dylib", "lib/librustllvm.dylib"],
23-
"winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll", "lib/libstd.rlib",
24-
"lib/rustrt.dll", "lib/rustllvm.dll"]
25-
}
26-
2718
snapshot_files = {
2819
"linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib",
2920
"lib/librustrt.so", "lib/librustllvm.so", "intrinsics.bc"],

src/snapshots.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
S 2011-07-11 f666c97
2+
linux-i386 434346526e3feecf80ceb58f132fb4ea6cbfec0a
3+
macos-i386 f643f88b1414bf43c1821a9d3eea0bdc8df2f68d
4+
winnt-i386 67e09bf1fb2ae0894cfc99fabee1ed716f218486
5+
16
S 2011-07-09 f42c947
27
linux-i386 9cb82d02baaccc6efc1b5dff5f3d41aa0c8546e8
38
macos-i386 5fd5b3fff6bdaaffc5a55d208370d3764076b54e

0 commit comments

Comments
 (0)