---

brson · brson · commit 7ac41250f221 · 2011-08-26T13:20:22.000-07:00
yaml --- r: 4953 b: refs/heads/master c: e3d3aaa h: refs/heads/master i: 4951: 22e6d63 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4133e3ec82f7e939341a37a7e348e43085603f7d
+refs/heads/master: e3d3aaadaa94f4eb7a4dceb96f610542ca7574ce
diff --git a/trunk/Makefile.in b/trunk/Makefile.in
@@ -186,8 +186,15 @@ SREQ$(1) = stage$(1)/rustc$(X)          \
            $$(MKFILES)
 endif
 
+ifeq ($(1),0)
+# Don't run the the stage0 compiler under valgrind - that ship has sailed
+CFG_VALGRIND_COMPILE$(1) =
+else
+CFG_VALGRIND_COMPILE$(1) = $$(CFG_VALGRIND_COMPILE)
+endif
+
 STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,stage$(1), \
-                $$(CFG_VALGRIND_COMPILE) stage$(1)/rustc$$(X) \
+                $$(CFG_VALGRIND_COMPILE$(1)) stage$(1)/rustc$$(X) \
                 $$(CFG_RUSTC_FLAGS))
 endef
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 4133e3ec82f7e939341a37a7e348e43085603f7d`
	`2`	`+refs/heads/master: e3d3aaadaa94f4eb7a4dceb96f610542ca7574ce`