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

diff --git a/ChangeLog b/ChangeLog
index 238dfe420b106b27aea8f67ca00546970316cb58..c513bb2afa4996db525d12e7a2050e789d5a8208 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 6137b23e0de2ab016f2f6a61ee73ffa4f3e128ab..5d43c485e6fce42f236b1af1c7879635f6175fb8 100644 (file)
--- 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: