diff options
| author | Graydon Hoare <[email protected]> | 2011-05-03 11:34:44 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2011-05-03 11:34:44 -0700 |
| commit | dbe5dc97687a1d7dd1aaa552c8b84c22765a0e9f (patch) | |
| tree | fb2a0d38e8892343ddc0dd68f1c5f3d1c902082a /mk | |
| parent | Small fixes to snapshot script. (diff) | |
| download | rust-dbe5dc97687a1d7dd1aaa552c8b84c22765a0e9f.tar.xz rust-dbe5dc97687a1d7dd1aaa552c8b84c22765a0e9f.zip | |
Attempt to shift build to stage0-from-snapshots.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/stage0.mk | 16 | ||||
| -rw-r--r-- | mk/stage1.mk | 6 |
2 files changed, 11 insertions, 11 deletions
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 |