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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 31b3e0825552441ccea5469b2692a702e44ba11f..9f45f59af1cc3d20e01cea5c8459dcdde9f03bb3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index adc171ec2e753ef54391bb0d7fa6ebbac18f3460..f3eca92935f7ad04c461809acca2cc8fcd57c599 100644 (file)
--- 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 4ff13d2e57efcebec000767798d3b5a21e3678a8..e278b1f56dc57f5251bf00bf5b3425e6fe7625d9 100644 (file)
--- 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 058c16354fc0ca5f837fd6a9a74eac6a15ee966b..0b2c62989ee0baee7795a30beac8a970bf8fc483 100755 (executable)
--- 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