From b145ee27c77fcce0f4ddb7fcb09bb516fc6d499d Mon Sep 17 00:00:00 2001
From: Greg McGary <greg@mcgary.org>
Date: Wed, 30 Aug 2000 22:57:10 +0000
Subject: Makefile.in (fixinc.sh): Pass CC, CFLAGS and LDFLAGS to mkfixinc.sh

	* Makefile.in (fixinc.sh): Pass CC, CFLAGS and LDFLAGS to mkfixinc.sh
	* fixinc/Makefile.in (fixincl): Pass $(LDFLAGS) to $(CC).
	* fixinc/mkfixinc.sh: Pass $CC, $CFLAGS and $LDFLAGS to $MAKE.

From-SVN: r36077
---
 gcc/ChangeLog          | 6 ++++++
 gcc/Makefile.in        | 3 ++-
 gcc/fixinc/Makefile.in | 2 +-
 gcc/fixinc/mkfixinc.sh | 9 ++++-----
 4 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 31b3e08..9f45f59 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2000-08-30  Greg McGary  <greg@mcgary.org>
 
+	* Makefile.in (fixinc.sh): Pass CC, CFLAGS and LDFLAGS to mkfixinc.sh
+	* fixinc/Makefile.in (fixincl): Pass $(LDFLAGS) to $(CC).
+	* fixinc/mkfixinc.sh: Pass $CC, $CFLAGS and $LDFLAGS to $MAKE.
+
+2000-08-30  Greg McGary  <greg@mcgary.org>
+
 	* tree.h (struct tree_int_cst): Wrap low and high in a sub-struct.
 	(TREE_INT_CST_LOW, TREE_INT_CST_HIGH): Access through sub-struct.
 	(TREE_INT_CST): New macro.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index adc171e..f3eca92 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1970,7 +1970,8 @@ fixinc.sh: $(FIXINCSRCDIR)/mkfixinc.sh $(FIXINCSRCDIR)/fixincl.c \
 	$(FIXINCSRCDIR)/server.c $(FIXINCSRCDIR)/gnu-regex.h \
 	$(FIXINCSRCDIR)/server.h $(FIXINCSRCDIR)/inclhack.def specs.ready
 	MAKE="$(MAKE)"; srcdir=`cd $(srcdir)/fixinc; pwd` ; \
-	export MAKE srcdir ; \
+	CC="$(CC)"; CFLAGS="$(CFLAGS)"; LDFLAGS="$(LDFLAGS)"; \
+	export MAKE srcdir CC CFLAGS LDFLAGS; \
 	cd ./fixinc; $(SHELL) $${srcdir}/mkfixinc.sh $(target)
 
 # Build fixed copies of system files.
diff --git a/gcc/fixinc/Makefile.in b/gcc/fixinc/Makefile.in
index 4ff13d2..e278b1f 100644
--- a/gcc/fixinc/Makefile.in
+++ b/gcc/fixinc/Makefile.in
@@ -73,7 +73,7 @@ all : $(TARGETS)
 gen : fixincl.x
 
 fixincl: $(OBJ) $(LIBERTY)
-	$(CC) $(FIXINC_DEFS) -o $@ $(OBJ) $(LIBERTY)
+	$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(OBJ) $(LIBERTY)
 
 $(OBJ)      : $(HDR)
 fixincl.o   : fixincl.x fixincl.c
diff --git a/gcc/fixinc/mkfixinc.sh b/gcc/fixinc/mkfixinc.sh
index 058c163..0b2c629 100755
--- a/gcc/fixinc/mkfixinc.sh
+++ b/gcc/fixinc/mkfixinc.sh
@@ -111,9 +111,8 @@ then
 fi
 
 #  OK.  We gotta make the thing.
-#
-echo $MAKE SHELL=\"$SHELL\" install-bin
-
 #  make and install either the binary or the default script
-#
-$MAKE SHELL="$SHELL" install-bin
+
+cmd="$MAKE SHELL=\"$SHELL\" CC=\"$CC\" CFLAGS=\"$CFLAGS\" LDFLAGS=\"$LDFLAGS\" install-bin"
+echo $cmd
+eval $cmd
-- 
cgit v1.1