dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to shift build to stage0-from-snapshots.

This commit is contained in:
Graydon Hoare 2011-05-03 11:34:44 -07:00
parent 54bfe8ee27
commit dbe5dc9768
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -188,6 +188,7 @@ probe_need CFG_GIT git
probe_need CFG_OCAMLC ocamlc probe_need CFG_OCAMLC ocamlc
probe_need CFG_PERL perl probe_need CFG_PERL perl
probe_need CFG_PYTHON python probe_need CFG_PYTHON python
probe_need CFG_CURL curl
probe CFG_LLVM_CONFIG llvm-config probe CFG_LLVM_CONFIG llvm-config
probe CFG_VALGRIND valgrind probe CFG_VALGRIND valgrind

16
mk/stage0.mk
View File

@ -1,9 +1,9 @@
stage0/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \ stage0/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES)
boot/rustboot$(X) $(MKFILES) @$(call E, fetch: $@)
@$(call E, compile: $@) $(S)src/etc/get-snapshot.py
$(BOOT) -shared -o $@ $<
stage0/rustc$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) $(BREQ) # These two will be made in the process of making rustc above.
@$(call E, compile: $@)
$(BOOT) -minimal -o $@ $< stage0/glue.o: stage0/rustc$(X)
$(Q)chmod 0755 $@
stage0/$(CFG_STDLIB): stage0/rustc$(X)

6
mk/stage1.mk
View File

@ -1,4 +1,5 @@
stage1/std.o: $(STDLIB_CRATE) $(STDLIB_INPUTS) stage0/rustc$(X) $(MKFILES) stage1/std.o: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
stage0/rustc$(X) stage0/$(CFG_STDLIB) $(LREQ) $(MKFILES)
@$(call E, compile: $@) @$(call E, compile: $@)
$(STAGE0) -c --shared -o $@ $< $(STAGE0) -c --shared -o $@ $<
@ -11,8 +12,7 @@ stage1/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ0)
@$(call E, compile: $@) @$(call E, compile: $@)
$(STAGE0) -c -o $@ $< $(STAGE0) -c -o $@ $<
stage1/glue.o: stage0/rustc$(X) stage0/$(CFG_STDLIB) \ stage1/glue.o: stage0/rustc$(X) stage0/$(CFG_STDLIB) $(LREQ) $(MKFILES)
rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
@$(call E, generate: $@) @$(call E, generate: $@)
$(STAGE0) -c -o $@ --glue $(STAGE0) -c -o $@ --glue

2
src/etc/snapshot.py
View File

@ -10,7 +10,7 @@ src_dir = scrub(os.getenv("CFG_SRC_DIR"))
if not src_dir: if not src_dir:
raise Exception("missing env var CFG_SRC_DIR") raise Exception("missing env var CFG_SRC_DIR")
snapshotfile = os.path.join(src_dir, "snapshots.txt") snapshotfile = os.path.join(src_dir, "src", "snapshots.txt")
download_url_base = "http://dl.rust-lang.org/stage0-snapshots" download_url_base = "http://dl.rust-lang.org/stage0-snapshots"
download_dir_base = "dl" download_dir_base = "dl"
download_unpack_base = os.path.join(download_dir_base, "unpack") download_unpack_base = os.path.join(download_dir_base, "unpack")

7
src/snapshots.txt
View File

@ -1,6 +1,7 @@
S 2011-05-02 ed40c85 S 2011-05-03 54bfe8e
linux-i386 de76e0930be363af87e32ba65e3d6b1284633550 linux-i386 1e831f0904acf20c24e5ee944be61b8665a45c31
winnt-i386 e69c11fbc62639ac3a3eef7ea36c9ad77209e2b1 macos-i386 eb20970d6ca784a9a7768a7eb1ce7d8f4af96fc9
winnt-i386 2799f8ab1fdc45a706f530e1552cbfcd07116edb
S 2011-04-29 7b95b5c S 2011-04-29 7b95b5c
linux-i386 f0e166816ce34adc9f7202bd3cfbd80623505f28 linux-i386 f0e166816ce34adc9f7202bd3cfbd80623505f28