---

yaml
---
r: 30705
b: refs/heads/incoming
c: cb34138
h: refs/heads/master
i:
  30703: 537d31e
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 0a26edca75a53839d63c0227d62f863dfb717e1b
+refs/heads/incoming: cb34138cd02563892fb317a7ed4a9537f18e4371
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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