SUN make and gcc 3.0: committed changes to branch

[Hans-Peter Nilsson <hans-peter dot nilsson at axis dot com>]

This is what I eventually checked in to the 3.0 branch.  I consulted the
autoconf docs for portable shell constructs.  Thankfully "test ! ..."
*is* portable, in contrast to "if ! ...".  I'll commit this tothe main
trunk too, but I need to bootstrap and check there separately.  Perhaps
there are more SUN make issues lurking there, since some java bits weren't
enabled for sparc-sun-solaris2.8 on the branch.  Also bootstrapped and
checked on i686-pc-linux-gnu.

libstdc++:ers, these patches were discussed on the gcc-patches list,
but I overlooked CC:ing you, sorry.  Approved by Alexandre Oliva.  Final
approval at <URL:http://gcc.gnu.org/ml/gcc-patches/2001-05/msg02013.html>.

toplevel:
	* configure.in (libstdcxx_flags): Do not try to execute
	libstdc++-v3/testsuite_flags until it exists.

gcc:
	* Makefile.in (s-mlib): Make backtick-commands always succeed.
	(DRIVER_DEFINES): Ditto.

libstdc++-v3:

	* src/Makefile.am (VPATH): Delimit with ":", not space.
	* src/Makefile.in: Regenerate.

	* configure.in (use of GLIBCPP_CHECK_GNU_MAKE): Don't fail if GNU
	make isn't found.
	* configure: Regenerate.

Index: configure.in
===================================================================
RCS file: /cvs/gcc/egcs/configure.in,v
retrieving revision 1.90.2.14
diff -p -c -r1.90.2.14 configure.in
*** configure.in	2001/05/19 04:22:20	1.90.2.14
--- configure.in	2001/05/30 06:29:54
*************** fi
*** 50,56 ****
  
  libstdcxx_version="target-libstdc++-v3"
  # Don't use libstdc++-v3's flags to configure/build itself.
! libstdcxx_flags='`case $$dir in libstdc++-v3) ;; *) $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags --build-includes ;; esac` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
  
  # these tools are built for the host environment
  # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
--- 50,56 ----
  
  libstdcxx_version="target-libstdc++-v3"
  # Don't use libstdc++-v3's flags to configure/build itself.
! libstdcxx_flags='`case $$dir in libstdc++-v3) ;; *) test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags --build-includes;; esac` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
  
  # these tools are built for the host environment
  # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
Index: gcc/Makefile.in
===================================================================
RCS file: /cvs/gcc/egcs/gcc/Makefile.in,v
retrieving revision 1.602.2.26
diff -p -c -r1.602.2.26 Makefile.in
*** Makefile.in	2001/05/20 19:55:23	1.602.2.26
--- Makefile.in	2001/05/30 06:29:59
*************** libgcc.a: $(LIBGCC_DEPS)
*** 1121,1132 ****
  multilib.h: s-mlib; @true
  s-mlib: $(srcdir)/genmultilib Makefile
  	$(SHELL) $(srcdir)/genmultilib \
! 	  "`test @enable_multilib@ = yes && echo $(MULTILIB_OPTIONS)`" \
! 	  "`test @enable_multilib@ = yes && echo $(MULTILIB_DIRNAMES)`" \
! 	  "`test @enable_multilib@ = yes && echo $(MULTILIB_MATCHES)`" \
! 	  "`test @enable_multilib@ = yes && echo $(MULTILIB_EXCEPTIONS)`" \
! 	  "`test @enable_multilib@ = yes && echo $(MULTILIB_EXTRA_OPTS)`" \
! 	  "`test @enable_multilib@ = yes && echo $(MULTILIB_EXCLUSIONS)`" \
  		> tmp-mlib.h
  	$(SHELL) $(srcdir)/move-if-change tmp-mlib.h multilib.h
  	$(STAMP) s-mlib
--- 1121,1132 ----
  multilib.h: s-mlib; @true
  s-mlib: $(srcdir)/genmultilib Makefile
  	$(SHELL) $(srcdir)/genmultilib \
! 	  "`test @enable_multilib@ != yes || echo $(MULTILIB_OPTIONS)`" \
! 	  "`test @enable_multilib@ != yes || echo $(MULTILIB_DIRNAMES)`" \
! 	  "`test @enable_multilib@ != yes || echo $(MULTILIB_MATCHES)`" \
! 	  "`test @enable_multilib@ != yes || echo $(MULTILIB_EXCEPTIONS)`" \
! 	  "`test @enable_multilib@ != yes || echo $(MULTILIB_EXTRA_OPTS)`" \
! 	  "`test @enable_multilib@ != yes || echo $(MULTILIB_EXCLUSIONS)`" \
  		> tmp-mlib.h
  	$(SHELL) $(srcdir)/move-if-change tmp-mlib.h multilib.h
  	$(STAMP) s-mlib
*************** DRIVER_DEFINES = \
*** 1322,1329 ****
    -DDEFAULT_TARGET_MACHINE=\"$(target_alias)\" \
    -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
    -DTOOLDIR_BASE_PREFIX=\"$(unlibsubdir)/../\" \
!   `test "$${SHLIB_LINK}" -a "@enable_shared@" = "yes" && echo "-DENABLE_SHARED_LIBGCC"` \
!   `test "$${SHLIB_MULTILIB}" && echo "-DNO_SHARED_LIBGCC_MULTILIB"`
  
  gcc.o: gcc.c $(CONFIG_H) system.h intl.h multilib.h \
      Makefile $(lang_specs_files) prefix.h $(GCC_H)
--- 1322,1329 ----
    -DDEFAULT_TARGET_MACHINE=\"$(target_alias)\" \
    -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
    -DTOOLDIR_BASE_PREFIX=\"$(unlibsubdir)/../\" \
!   `test "X$${SHLIB_LINK}" = "X" || test "@enable_shared@" != "yes" || echo "-DENABLE_SHARED_LIBGCC"` \
!   `test "X$${SHLIB_MULTILIB}" = "X" || echo "-DNO_SHARED_LIBGCC_MULTILIB"`
  
  gcc.o: gcc.c $(CONFIG_H) system.h intl.h multilib.h \
      Makefile $(lang_specs_files) prefix.h $(GCC_H)
Index: libstdc++-v3/configure.in
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/configure.in,v
retrieving revision 1.54.2.3
diff -p -c -r1.54.2.3 configure.in
*** configure.in	2001/05/14 19:48:53	1.54.2.3
--- configure.in	2001/05/30 06:30:36
*************** AM_PROG_LIBTOOL
*** 51,59 ****
  AC_SUBST(enable_shared)
  AC_SUBST(enable_static)
  GLIBCPP_CHECK_GNU_MAKE
!   if test "x$_cv_gnu_make_command" = "x"; then
!     AC_MSG_ERROR([GNU make not found. Please install it or correct your path.])
!   fi
  AM_CONFIG_HEADER(config.h)
  
  # Check for c++ or library specific bits that don't require linking.
--- 51,59 ----
  AC_SUBST(enable_shared)
  AC_SUBST(enable_static)
  GLIBCPP_CHECK_GNU_MAKE
! 
! 
! 
  AM_CONFIG_HEADER(config.h)
  
  # Check for c++ or library specific bits that don't require linking.
Index: libstdc++-v3/src/Makefile.am
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/src/Makefile.am,v
retrieving revision 1.71.2.6
diff -p -c -r1.71.2.6 Makefile.am
*** Makefile.am	2001/05/19 04:19:31	1.71.2.6
--- Makefile.am	2001/05/30 06:30:36
*************** sources = \
*** 173,181 ****
  	string-inst.cc wstring-inst.cc 
  
  
! VPATH += $(top_srcdir) $(top_srcdir)/src
! VPATH += $(GLIBCPP_INCLUDE_DIR) 
! VPATH += $(GLIBCPP_INCLUDE_DIR)/std $(C_INCLUDE_DIR)
  
  libstdc___la_SOURCES = $(sources)
  
--- 173,179 ----
  	string-inst.cc wstring-inst.cc 
  
  
! VPATH = $(top_srcdir):$(top_srcdir)/src:$(GLIBCPP_INCLUDE_DIR):$(GLIBCPP_INCLUDE_DIR)/std:$(C_INCLUDE_DIR)
  
  libstdc___la_SOURCES = $(sources)
  

brgds, H-P