---

yaml
---
r: 24105
b: refs/heads/master
c: cb34138
h: refs/heads/master
i:
  24103: 80cfb5b
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0a26edca75a53839d63c0227d62f863dfb717e1b
+refs/heads/master: cb34138cd02563892fb317a7ed4a9537f18e4371
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/Makefile.in

@@ -355,18 +355,30 @@ endif
 # Add RUSTFLAGS_STAGEN values to the build command
 EXTRAFLAGS_STAGE$(1) = $$(RUSTFLAGS_STAGE$(1))
 
+CFGFLAG$(1)_T_$(2)_H_$(3) = stage$(1)
+
+# XXX: Terrible hack. No time to explain! Remove after snapshot.
+ifeq ($(1),0)
+ifeq ($(3),i686-unknown-linux-gnu)
+CFGFLAG$(1)_T_$(2)_H_$(3) = stage1
+endif
+ifeq ($(3),i686-apple-darwin)
+CFGFLAG$(1)_T_$(2)_H_$(3) = stage1
+endif
+endif
+
 STAGE$(1)_T_$(2)_H_$(3) := 						\
 	$$(Q)$$(call CFG_RUN_TARG,$(1),				\
 		$$(CFG_VALGRIND_COMPILE$(1)) 			\
 		$$(HBIN$(1)_H_$(3))/rustc$$(X)			\
-		--cfg stage$(1)					\
+		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3))			\
 		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2))
 
 PERF_STAGE$(1)_T_$(2)_H_$(3) := 				\
 	$$(Q)$$(call CFG_RUN_TARG,$(1),				\
 		$$(CFG_PERF_TOOL) 						\
 		$$(HBIN$(1)_H_$(3))/rustc$$(X)			\
-		--cfg stage$(1)					\
+		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3))			\
 		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2))
 
 endef