---

yaml
---
r: 5627
b: refs/heads/master
c: 6306c81
h: refs/heads/master
i:
  5625: 284e872
  5623: 71a55d8
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dbce103fb6bc35ce38f0233a7a0fdf70f3e10ca
+refs/heads/master: 6306c8182668cccf899f1fd864fa85e139eb779d

trunk/Makefile.in

@@ -151,6 +151,7 @@ COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
 export CFG_SRC_DIR
 export CFG_BUILD_DIR
 export CFG_VERSION
+export CFG_HOST_TRIPLE
 export CFG_LLVM_ROOT
 export CFG_ENABLE_MINGW_CROSS
 

trunk/mk/perf.mk

@@ -1,11 +1,11 @@
 
 ifdef CFG_PERF_TOOL
-rustc-perf$(X): stage2/rustc$(X)
+rustc-perf$(X): stage2/bin/rustc$(X)
 	@$(call E, perf compile: $@)
 	$(PERF_STAGE1) -L stage2 -o $@ $(COMPILER_CRATE) >rustc-perf.err 2>&1
 	$(Q)rm -f $@
 else
-rustc-perf$(X): stage2/rustc$(X)
+rustc-perf$(X): stage2/bin/rustc$(X)
 	$(Q)touch $@
 endif
 

trunk/mk/stage0.mk

@@ -1,5 +1,5 @@
-# FIXME: temporary hack: stdlib and rustrt come in the lib/ directory,
-# but we want them in the base directory, so we move them out.
+# 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

trunk/mk/tests.mk

@@ -68,7 +68,7 @@ STDTEST_INPUTS := $(wildcard $(S)src/test/stdtest/*rs)
 ifdef CTEST_VALGRIND
   CFG_RUN_CTEST=$(call CFG_RUN_TEST,$(2))
 else
-  CFG_RUN_CTEST=$(call CFG_RUN,stage$(1)/lib,$(2))
+  CFG_RUN_CTEST=$(call CFG_RUN,stage$(1)/lib/rustc/$(CFG_HOST_TRIPLE),$(2))
 endif
 
 ######################################################################