Re: PATCH to top-level Makefile

[Jim Wilson <wilson at cygnus dot com>]

	* Makefile.in (bootstrap): Pass TARGET_FLAGS_TO_PASS to sub-make
	that builds run-time libraries.

I am getting bootstrap failures because of this patch.

c++ -c -g -O2 -fvtable-thunks -D_GNU_SOURCE -fno-implicit-templates -I. -I../../../libio -nostdinc++ -D_IO_MTSAFE_IO ../../../libio/fstream.cc
In file included from ../../../libio/fstream.h:30,
                 from ../../../libio/fstream.cc:34:
../../../libio/iostream.h:91: parse error before `__extension__'
../../../libio/iostream.h:208: parse error before `__extension__'
make[2]: *** [fstream.o] Error 1

Note that the libio build is using `c++' when it should be using
$objdir/gcc/xgcc -B$objdir/gcc/.  The problem is that the makefile variables
r and s are not set, and these are used by TARGET_FLAGS_TO_PASS.

As long as I am fixing this, I think it is wrong to use TARGET_FLAGS_TO_PASS
here, since we should not force the target environment on a `make all' command.
I changed this to BASE_FLAGS_TO_PASS.

Also, I see that there are two `make all' commands, and you only changed one
of them.

I will await comment before I check in this patch.

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.

Index: Makefile.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/Makefile.in,v
retrieving revision 1.29
diff -p -r1.29 Makefile.in
*** Makefile.in	1998/09/20 11:21:12	1.29
--- Makefile.in	1998/09/23 01:47:31
*************** bootstrap bootstrap-lean bootstrap2 boot
*** 1351,1358 ****
  	$(SET_LIB_PATH) \
  	echo "$$msg"; \
  	cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
! 	@echo "Building runtime libraries"; \
! 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all
  
  .PHONY: cross
  cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
--- 1351,1361 ----
  	$(SET_LIB_PATH) \
  	echo "$$msg"; \
  	cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
! 	@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
*************** cross: all-texinfo all-bison all-byacc a
*** 1361,1368 ****
  	$(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++"
  
  .PHONY: check-gcc
  check-gcc:
--- 1364,1374 ----
  	$(SET_LIB_PATH) \
  	echo "Building the C and C++ compiler"; \
  	cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) 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: