diff options
| author | Greg McGary <greg@mcgary.org> | 2000-08-30 22:57:10 +0000 |
|---|---|---|
| committer | Greg McGary <gkm@gcc.gnu.org> | 2000-08-30 22:57:10 +0000 |
| commit | b145ee27c77fcce0f4ddb7fcb09bb516fc6d499d (patch) | |
| tree | 65e24038486af2fdd644cb3236c1089d9eb55ff0 | |
| parent | 2afaa41c5fdc34be0208be3148f8e83806899f21 (diff) | |
| download | gcc-b145ee27c77fcce0f4ddb7fcb09bb516fc6d499d.zip gcc-b145ee27c77fcce0f4ddb7fcb09bb516fc6d499d.tar.gz gcc-b145ee27c77fcce0f4ddb7fcb09bb516fc6d499d.tar.bz2 | |
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
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/Makefile.in | 3 | ||||
| -rw-r--r-- | gcc/fixinc/Makefile.in | 2 | ||||
| -rwxr-xr-x | gcc/fixinc/mkfixinc.sh | 9 |
4 files changed, 13 insertions, 7 deletions
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 |