From 7dbce103fb6bc35ce38f0233a7a0fdf70f3e10ca Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 29 Sep 2011 12:06:37 -0700
Subject: [PATCH] Remove the redundant definition of STAGE in makefiles

---
 Makefile.in  | 9 +++++++--
 mk/stageN.mk | 8 --------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 1561f2869e9..fc57b7aaafa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -197,8 +197,13 @@ CFG_VALGRIND_COMPILE$(1) = $$(CFG_VALGRIND_COMPILE)
 endif
 
 STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,stage$(1), \
-                $$(CFG_VALGRIND_COMPILE$(1)) stage$(1)/bin/rustc$$(X) \
-                $$(CFG_RUSTC_FLAGS))
+                $$(CFG_VALGRIND_COMPILE) stage$(1)/bin/rustc$$(X) \
+                $$(CFG_RUSTC_FLAGS) --target=$(2))
+
+PERF_STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,stage$(1), \
+                $$(CFG_PERF_TOOL) stage$(1)/bin/rustc$$(X) \
+                $$(CFG_RUSTC_FLAGS) --target=$(2))
+
 endef
 
 FUZZ := stage1/bin/fuzzer$(X)
diff --git a/mk/stageN.mk b/mk/stageN.mk
index 0f890ee8022..3d586f9e456 100644
--- a/mk/stageN.mk
+++ b/mk/stageN.mk
@@ -19,14 +19,6 @@ define STAGE_N
 # for different directories, to handle cases where (say) a test relies on a
 # compiler that relies on a .o file.
 
-STAGE$(2) := $$(Q)$$(call CFG_RUN_TARG,stage$(2), \
-                $$(CFG_VALGRIND_COMPILE) stage$(2)/bin/rustc$$(X) \
-                $$(CFG_RUSTC_FLAGS) --target=$(3))
-
-PERF_STAGE$(2) := $$(Q)$$(call CFG_RUN_TARG,stage$(2), \
-                $$(CFG_PERF_TOOL) stage$(2)/bin/rustc$$(X) \
-                $$(CFG_RUSTC_FLAGS) --target=$(3))
-
 stage$(2)/bin/%.o: stage$(2)/bin/%.s
 	@$$(call E, assemble [gcc]: $$@)
 	$$(Q)gcc $$(CFG_GCCISH_CFLAGS) -o $$@ -c $$<