diff options
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | mk/stage0.mk | 16 | ||||
| -rw-r--r-- | mk/stage1.mk | 6 | ||||
| -rw-r--r-- | src/etc/snapshot.py | 2 | ||||
| -rw-r--r-- | src/snapshots.txt | 7 |
5 files changed, 17 insertions, 15 deletions
@@ -188,6 +188,7 @@ probe_need CFG_GIT git probe_need CFG_OCAMLC ocamlc probe_need CFG_PERL perl probe_need CFG_PYTHON python +probe_need CFG_CURL curl probe CFG_LLVM_CONFIG llvm-config probe CFG_VALGRIND valgrind diff --git a/mk/stage0.mk b/mk/stage0.mk index decf742b..c41cddaf 100644 --- a/mk/stage0.mk +++ b/mk/stage0.mk @@ -1,9 +1,9 @@ -stage0/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \ - boot/rustboot$(X) $(MKFILES) - @$(call E, compile: $@) - $(BOOT) -shared -o $@ $< +stage0/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES) + @$(call E, fetch: $@) + $(S)src/etc/get-snapshot.py -stage0/rustc$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) $(BREQ) - @$(call E, compile: $@) - $(BOOT) -minimal -o $@ $< - $(Q)chmod 0755 $@ +# These two will be made in the process of making rustc above. + +stage0/glue.o: stage0/rustc$(X) + +stage0/$(CFG_STDLIB): stage0/rustc$(X) diff --git a/mk/stage1.mk b/mk/stage1.mk index d003134a..e01942a5 100644 --- a/mk/stage1.mk +++ b/mk/stage1.mk @@ -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: $@) $(STAGE0) -c --shared -o $@ $< @@ -11,8 +12,7 @@ stage1/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ0) @$(call E, compile: $@) $(STAGE0) -c -o $@ $< -stage1/glue.o: stage0/rustc$(X) stage0/$(CFG_STDLIB) \ - rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME) +stage1/glue.o: stage0/rustc$(X) stage0/$(CFG_STDLIB) $(LREQ) $(MKFILES) @$(call E, generate: $@) $(STAGE0) -c -o $@ --glue diff --git a/src/etc/snapshot.py b/src/etc/snapshot.py index 7dd963e8..924568ee 100644 --- a/src/etc/snapshot.py +++ b/src/etc/snapshot.py @@ -10,7 +10,7 @@ src_dir = scrub(os.getenv("CFG_SRC_DIR")) if not 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_dir_base = "dl" download_unpack_base = os.path.join(download_dir_base, "unpack") diff --git a/src/snapshots.txt b/src/snapshots.txt index 8ca9cd50..08b989ca 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,6 +1,7 @@ -S 2011-05-02 ed40c85 - linux-i386 de76e0930be363af87e32ba65e3d6b1284633550 - winnt-i386 e69c11fbc62639ac3a3eef7ea36c9ad77209e2b1 +S 2011-05-03 54bfe8e + linux-i386 1e831f0904acf20c24e5ee944be61b8665a45c31 + macos-i386 eb20970d6ca784a9a7768a7eb1ce7d8f4af96fc9 + winnt-i386 2799f8ab1fdc45a706f530e1552cbfcd07116edb S 2011-04-29 7b95b5c linux-i386 f0e166816ce34adc9f7202bd3cfbd80623505f28 |