From 9aec989f02e1af104b6c70da8ad4c494e0e81a46 Mon Sep 17 00:00:00 2001
From: "R. Kelley Cook" <kcook@gcc.gnu.org>
Date: Sun, 7 Sep 2003 02:11:40 +0000
Subject: [PATCH] Makefile.in: Define $REMAKE to be $MAKE with LANGUAGES &
 BOOT_CFLAGS and use it throughout.

2003-09-07  Kelley Cook  <kelleycook@wideopenwest.com>

	* Makefile.in: Define $REMAKE to be $MAKE with LANGUAGES & BOOT_CFLAGS
	and use it throughout.

From-SVN: r71155
---
 gcc/ChangeLog   |  9 +++++++--
 gcc/Makefile.in | 33 +++++++++++++++++----------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a9183b428d0..e5a3270f83f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,9 @@
-Sun Sep  7 00:22:22 CEST 2003  Jan Hubicka  <jh@suse.cz>
+2003-09-07  Kelley Cook  <kelleycook@wideopenwest.com>
+
+	* Makefile.in: Define $REMAKE to be $MAKE with LANGUAGES & BOOT_CFLAGS
+	and use it throughout.
+	
+2003-09-07  Jan Hubicka  <jh@suse.cz>
 
 	* cfgcleanup.c (try_simplify_condjump): Fix my previous patch.
 
@@ -9,7 +14,7 @@ Sun Sep  7 00:22:22 CEST 2003  Jan Hubicka  <jh@suse.cz>
 	functions.
 	(cgraph_varpool_finalize_decl): Notice global symbol when needed.
 
-Sat Sep  6 23:49:13 CEST 2003  Jan Hubicka  <jh@suse.cz>
+2003-09-06  Jan Hubicka  <jh@suse.cz>
 
 	PR target/12070
 	* calls.c (emit_library_call_value_1): Fix saving of BLKmode arguments.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 672e09ac0f0..679a7d4db94 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -223,6 +223,7 @@ STAMP = echo timestamp >
 
 # Make sure the $(MAKE) variable is defined.
 @SET_MAKE@
+REMAKE=$(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)"
 
 # --------
 # UNSORTED
@@ -3468,22 +3469,22 @@ unstage1 unstage2 unstage3 unstage4 unstageprofile unstagefeedback:
 	echo $${stage}_build > stage_last
 
 restage1: unstage1
-	$(MAKE) stage1_build
+	$(REMAKE) stage1_build
 
 restage2: unstage2
-	$(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage2_build
+	$(REMAKE) stage2_build
 
 restage3: unstage3
-	$(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage3_build
+	$(REMAKE) stage3_build
 
 restage4: unstage4
-	$(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage4_build
+	$(REMAKE) stage4_build
 
 restageprofile: unstageprofile
-	$(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stageprofile_build
+	$(REMAKE) stageprofile_build
 
 restagefeedback: unstagefeedback
-	$(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stagefeedback_build
+	$(REMAKE) stagefeedback_build
 
 # Bubble up a bugfix through all the stages.  Primarily useful for fixing
 # bugs that cause the compiler to crash while building stage 2.
@@ -3491,31 +3492,31 @@ bubblestrap:
 	if test -f stage_last; then \
 	  LAST=`sed -e 's/_build//' < stage_last`; \
 	  if test "$$LAST" != "stage1"; then \
-	    $(MAKE) $$LAST; \
+	    $(REMAKE) $$LAST; \
 	    $(STAMP) $${LAST}_copy; \
 	  fi; \
 	fi
 	if test -f stage1_copy; then $(MAKE) unstage1; fi
-	$(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage1_copy
+	$(REMAKE) stage1_copy
 	if test -f stage2_copy; then $(MAKE) unstage2; fi
-	$(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage2_copy
+	$(REMAKE) stage2_copy
 	if test -f stage3_copy; then $(MAKE) unstage3; fi
-	$(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage3_build
+	$(REMAKE) stage3_build
 	if test -f stage4_copy; then \
-	  $(MAKE) stage3_copy; $(MAKE) unstage4; \
-	  $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage4_build || exit 1; \
+	  $(REMAKE) stage3_copy; $(MAKE) unstage4; \
+	  $(REMAKE) stage4_build || exit 1; \
 	fi
 
 quickstrap:
 	if test -f stage_last ; then \
-	  LAST=`cat stage_last`; rm $$LAST; $(MAKE) BOOT_CFLAGS="$(BOOT_CFLAGS)" LANGUAGES="$(LANGUAGES)" $$LAST; \
+	  LAST=`cat stage_last`; rm $$LAST; $(REMAKE) $$LAST; \
 	else \
-	  $(MAKE) stage1_build; \
+	  $(REMAKE) stage1_build; \
 	fi
 
 cleanstrap:
 	-$(MAKE) clean
-	$(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" bootstrap
+	$(REMAKE) bootstrap
 
 unstrap:
 	-rm -rf stage[234]*
@@ -3526,7 +3527,7 @@ unstrap:
 # not from scratch.
 restrap:
 	$(MAKE) unstrap
-	$(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" bootstrap
+	$(REMAKE) bootstrap
 
 # Compare the object files in the current directory with those in the
 # stage2 directory.
-- 
2.30.2