From dbe5dc97687a1d7dd1aaa552c8b84c22765a0e9f Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Tue, 3 May 2011 11:34:44 -0700
Subject: Attempt to shift build to stage0-from-snapshots.

---
 mk/stage0.mk | 16 ++++++++--------
 mk/stage1.mk |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'mk')

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
 
-- 
cgit v1.2.3