From 0599289144c8ba97b2a72ddc8cc42a05930f004b Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Thu, 24 Oct 1996 16:13:43 +0000
Subject: [PATCH] 	* Makefile.in (EXTRA_GCC_FLAGS): Pass down
 GCC_FOR_TARGET 	unconditionally. 	(MAKEOVERRIDES): Define
 (revert this part of October 18 change).

---
 ChangeLog   | 6 ++++++
 Makefile.in | 7 ++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 877eb8e29aa..bba31fa6bd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct 24 12:12:04 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (EXTRA_GCC_FLAGS): Pass down GCC_FOR_TARGET
+	unconditionally.
+	(MAKEOVERRIDES): Define (revert this part of October 18 change).
+
 Thu Oct 24 09:02:07 1996  Stu Grossman  (grossman@critters.cygnus.com)
 
 	* Makefile.in (FLAGS_TO_PASS):  Add $(HOST_FLAGS) to allow the
diff --git a/Makefile.in b/Makefile.in
index dc7621b2d3c..a5a01154a11 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -418,11 +418,7 @@ EXTRA_GCC_FLAGS = \
 	'HOST_PREFIX_1=$(HOST_PREFIX_1)' \
 	'NM=$(NM)' \
 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
-	"GCC_FOR_TARGET=`if echo '$(MAKEFLAGS)' | grep CC_FOR_TARGET >/dev/null 2>&1; then \
-	  echo '$$(CC_FOR_TARGET)'; \
-	else \
-	  echo $(GCC_FOR_TARGET); \
-	fi`" \
+	'GCC_FOR_TARGET=$(GCC_FOR_TARGET)' \
 	`if test x"$(LANGUAGES)" != x; then echo "LANGUAGES=$(LANGUAGES)"; fi` \
 	`if test x"$(STMP_FIXPROTO)" != x; then echo "STMP_FIXPROTO=$(STMP_FIXPROTO)"; fi` \
 	`if test x"$(LIMITS_H_TEST)" != x; then echo "LIMITS_H_TEST=$(LIMITS_H_TEST)"; fi` \
@@ -1573,6 +1569,7 @@ newlib.tar.gz: $(DIST_SUPPORT) $(NEWLIB_SUPPORT_DIRS) newlib
 		DEVO_SUPPORT="$(DEVO_SUPPORT) COPYING.NEWLIB" newlib
 
 .NOEXPORT:
+MAKEOVERRIDES=
 
 # start-sanitize-chill
 ## This is ugly, but I don't want GNU make to put these variables in
-- 
2.30.2