diff options
| author | Jim Wilson <wilson@cygnus.com> | 1998-09-24 11:13:50 +0000 |
|---|---|---|
| committer | Jim Wilson <wilson@gcc.gnu.org> | 1998-09-24 04:13:50 -0700 |
| commit | f6b58262981ac267ed713abe542b5b3964baf961 (patch) | |
| tree | 2b81ca96c961bacb22772bd0fd659849310b3b59 | |
| parent | c10638c92243bc58ec745d4229927a55ba8da730 (diff) | |
| download | gcc-f6b58262981ac267ed713abe542b5b3964baf961.zip gcc-f6b58262981ac267ed713abe542b5b3964baf961.tar.gz gcc-f6b58262981ac267ed713abe542b5b3964baf961.tar.bz2 | |
Fix `make bootstrap' failures where libraries are compiled with wrong compiler.
* Makefile.in (bootstrap): Set r and s before make all. Use
BASE_FLAGS_TO_PASS in make all.
(cross): Likewise.
From-SVN: r22569
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 14 |
2 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,9 @@ +1998-09-22 Jim Wilson <wilson@cygnus.com> + + * Makefile.in (bootstrap): Set r and s before make all. Use + BASE_FLAGS_TO_PASS in make all. + (cross): Likewise. + 1998-09-20 Mark Mitchell <mark@markmitchell.com> * Makefile.in (bootstrap): Pass TARGET_FLAGS_TO_PASS to `make all'. diff --git a/Makefile.in b/Makefile.in index 6137b23..5d43c48 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1351,8 +1351,11 @@ bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean b $(SET_LIB_PATH) \ echo "$$msg"; \ cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare - @echo "Building runtime libraries"; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all + @r=`pwd`; export r; \ + s=`cd $(srcdir); pwd` ; export s; \ + $(SET_LIB_PATH) \ + echo "Building runtime libraries"; \ + $(MAKE) $(BASE_FLAGS_TO_PASS) all .PHONY: cross cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld @@ -1361,8 +1364,11 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld $(SET_LIB_PATH) \ echo "Building the C and C++ compiler"; \ cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++" - @echo "Building runtime libraries"; \ - $(MAKE) all LANGUAGES="c c++" + @r=`pwd`; export r; \ + s=`cd $(srcdir); pwd` ; export s; \ + $(SET_LIB_PATH) \ + echo "Building runtime libraries"; \ + $(MAKE) $(BASE_FLAGS_TO_PASS) all LANGUAGES="c c++" .PHONY: check-gcc check-gcc: |