提交 de6d07ab 编写于 作者: B Brian Anderson

Register snapshots and finish filesystem reorg

上级 80829af8
# FIXME: We're temorarily moving stuff all over the place here to make
# the old snapshot compatible with the new build rules
stage0/bin/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES)
@$(call E, fetch: $@)
$(Q)$(S)src/etc/get-snapshot.py
$(Q)cp stage0/rustc$(X) stage0/bin/rustc$(X)
$(Q)cp stage0/$(CFG_RUNTIME) stage0/lib/$(CFG_RUNTIME)
$(Q)cp stage0/$(CFG_RUSTLLVM) stage0/lib/$(CFG_RUSTLLVM)
$(Q)mkdir -p stage0/bin/lib
$(Q)cp stage0/lib/intrinsics.bc stage0/bin/lib/intrinsics.bc
$(Q)cp stage0/lib/glue.o stage0/bin/lib/glue.o
$(Q)cp stage0/lib/main.o stage0/bin/lib/main.o
$(Q)touch $@
# Host libs will be made in the process of making rustc above.
......
......@@ -27,13 +27,10 @@ stage$(2)/lib/%.o: stage$(2)/lib/%.s
@$$(call E, assemble [gcc]: $$@)
$$(Q)gcc $$(CFG_GCCISH_CFLAGS) -o $$@ -c $$<
# FIXME: the bin/lib/libstd.so dep is transitional
stage$(2)/bin/rustc$$(X): $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
stage$(2)/lib/$$(CFG_RUNTIME) \
$$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(2)) \
stage$(2)/lib/$$(CFG_RUSTLLVM) \
stage$(1)/bin/lib/$$(CFG_STDLIB) \
$$(SREQ$(1)$(3))
@$$(call E, compile_and_link: $$@)
$$(STAGE$(1)) -L stage$(2)/lib -o $$@ $$<
......@@ -97,12 +94,6 @@ stage$(2)/lib/rustc/$(3)/libstd.rlib: \
@$$(call E, compile_and_link: $$@)
$$(STAGE$(2)) --lib --static -o $$@ $$<
# FIXME: Transitional so that stage0 can find std when building stage1/rustc
stage$(2)/bin/lib/$$(CFG_STDLIB): stage$(2)/lib/rustc/$(3)/$$(CFG_STDLIB)
@$$(call E, cp: $$@)
$$(Q)mkdir -p stage$(2)/bin/lib
$$(Q)cp $$< $$@
stage$(2)/lib/rustc/$(3)/$$(CFG_RUNTIME): rt/$$(CFG_RUNTIME)
@$$(call E, cp: $$@)
$$(Q)cp $$< $$@
......
......@@ -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)
......
......@@ -15,16 +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")
# FIXME: Transitional
old_snapshot_files = {
"linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/main.o",
"librustrt.so", "librustllvm.so", "lib/intrinsics.bc"],
"macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/main.o",
"librustrt.dylib", "librustllvm.dylib", "lib/intrinsics.bc"],
"winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll", "lib/main.o",
"rustrt.dll", "rustllvm.dll", "lib/intrinsics.bc"]
}
snapshot_files = {
"linux": ["bin/rustc", "lib/libstd.so",
"lib/librustrt.so", "lib/librustllvm.so"],
......
S 2011-09-29 80829af
linux-i386 0bf17c8bfdf7e3400cd546577d4f57b7be821441
macos-i386 9b40e0c830396469811e9e6e0b430d0d51876a27
winnt-i386 735b189037ab45d88f937cbe391c4e30aaf1182b
S 2011-09-28 a3a2737
linux-i386 d255b2ec7205209b7d7fe71be84def6306491387
macos-i386 1ff3b71ccfc7e404c813b68a7a257406f292b819
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册