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
This commit is contained in:
parent
a076f6a483
commit
787d2fb712
@ -1,3 +1,10 @@
|
||||
2001-03-27 Alexandre Oliva <aoliva@redhat.com>
|
||||
|
||||
* 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 <bkoz@redhat.com>
|
||||
|
||||
* include/bits/c++config (_STL_USE_CONCEPT_CHECKS): Disable by default.
|
||||
|
@ -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 $@
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
@ -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 $@
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user