---

yaml
---
r: 13735
b: refs/heads/master
c: c88ab58
h: refs/heads/master
i:
  13733: f2fe26c
  13731: 45a2252
  13727: dc60629
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c3b98cabe1d7bee4878a967507ae745e9bfe13ac
+refs/heads/master: c88ab58c68a5ec0b8c85f4c03827db57d13d87e2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/Makefile.in

@@ -346,19 +346,22 @@ else
 CFG_VALGRIND_COMPILE$(1) = $$(CFG_VALGRIND_COMPILE)
 endif
 
+# Add RUSTFLAGS_STAGEN values to the build command
+EXTRAFLAGS_STAGE$(1) = $$(RUSTFLAGS_STAGE$(1))
+
 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_RUSTC_FLAGS) --target=$(2))
+		$$(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_RUSTC_FLAGS) --target=$(2))
+		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2))
 
 endef