From 787d2fb712fa7871c40a87b44b86adae14ae3f7a Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Wed, 28 Mar 2001 01:19:42 +0000 Subject: [PATCH] Makefile.am (CXXLINK): Use CXX again, and choose CXX tag explicitly. * libsupc++/Makefile.am (CXXLINK): Use CXX again, and choose CXX tag explicitly. * src/Makefile.am (CXXLINK): Likewise. * libsupc++/Makefile.in, src/Makefile.in: Rebuilt. From-SVN: r40894 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/libsupc++/Makefile.am | 12 +++++++----- libstdc++-v3/libsupc++/Makefile.in | 12 +++++++----- libstdc++-v3/src/Makefile.am | 14 ++++++++------ libstdc++-v3/src/Makefile.in | 12 +++++++----- 5 files changed, 36 insertions(+), 21 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8c5dd14..8ed8178 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2001-03-27 Alexandre Oliva + + * libsupc++/Makefile.am (CXXLINK): Use CXX again, and choose + CXX tag explicitly. + * src/Makefile.am (CXXLINK): Likewise. + * libsupc++/Makefile.in, src/Makefile.in: Rebuilt. + 2001-03-27 Benjamin Kosnik * include/bits/c++config (_STL_USE_CONCEPT_CHECKS): Disable by default. diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 09434a0..4694032 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -133,11 +133,13 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \ --mode=compile $(CXX) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) -# 3) We have a problem when building the shared libstdc++ object if -# the rules automake generates would be used. We cannot allow CXX to -# be used in libtool since this would add -lstdc++ to the link line -# which of course is problematic at this point. -CXXLINK = $(LIBTOOL) --mode=link "$(CC)" \ +# 3) We'd have a problem when building the shared libstdc++ object if +# the rules automake generates would be used. We cannot allow g++ to +# be used since this would add -lstdc++ to the link line which of +# course is problematic at this point. So, we get the top-level +# directory to configure libstdc++-v3 to use gcc as the C++ +# compilation driver. +CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \ @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 1bfff79..79fe2e9 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -221,11 +221,13 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \ $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) -# 3) We have a problem when building the shared libstdc++ object if -# the rules automake generates would be used. We cannot allow CXX to -# be used in libtool since this would add -lstdc++ to the link line -# which of course is problematic at this point. -CXXLINK = $(LIBTOOL) --mode=link "$(CC)" \ +# 3) We'd have a problem when building the shared libstdc++ object if +# the rules automake generates would be used. We cannot allow g++ to +# be used since this would add -lstdc++ to the link line which of +# course is problematic at this point. So, we get the top-level +# directory to configure libstdc++-v3 to use gcc as the C++ +# compilation driver. +CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \ @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ CONFIG_HEADER = ../config.h diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 1c486ba..243b7eb 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## USA. -## $Id: Makefile.am,v 1.77 2001/03/02 21:38:26 bkoz Exp $ +## $Id: Makefile.am,v 1.78 2001/03/25 00:16:56 pme Exp $ AUTOMAKE_OPTIONS = 1.3 gnits MAINT_CHARSET = latin1 @@ -328,9 +328,11 @@ AM_CXXFLAGS = \ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) -# 3) We have a problem when building the shared libstdc++ object if -# the rules automake generates would be used. We cannot allow CXX to -# be used in libtool since this would add -lstdc++ to the link line -# which of course is problematic at this point. -CXXLINK = $(LIBTOOL) --mode=link "$(CC)" \ +# 3) We'd have a problem when building the shared libstdc++ object if +# the rules automake generates would be used. We cannot allow g++ to +# be used since this would add -lstdc++ to the link line which of +# course is problematic at this point. So, we get the top-level +# directory to configure libstdc++-v3 to use gcc as the C++ +# compilation driver. +CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \ @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 8486367..c48adc7 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -313,11 +313,13 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) -# 3) We have a problem when building the shared libstdc++ object if -# the rules automake generates would be used. We cannot allow CXX to -# be used in libtool since this would add -lstdc++ to the link line -# which of course is problematic at this point. -CXXLINK = $(LIBTOOL) --mode=link "$(CC)" \ +# 3) We'd have a problem when building the shared libstdc++ object if +# the rules automake generates would be used. We cannot allow g++ to +# be used since this would add -lstdc++ to the link line which of +# course is problematic at this point. So, we get the top-level +# directory to configure libstdc++-v3 to use gcc as the C++ +# compilation driver. +CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \ @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ CONFIG_HEADER = ../config.h -- 2.7.4