This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Re: libtool upgrade broke libstdc++-v3 on Solaris


On Mar 27, 2001, Alexandre Oliva <aoliva@redhat.com> wrote:

> 	* libsupc++/Makefile.am (CXXLINK): Use CXX again, and choose
> 	CXX tag explicitly.

Many people have noticed a problem with this patch.  The problem was
that the newly-added --tag CXX was clobbering the effects of --tag
disable-shared.  This patch fixes it.  I've verified that
libsupc++convenience is no longer empty, and libstdc++ now contains
all of the libsupc++convenience object files.  I'm checking this in
mainline and 3.0 branch.  Sorry about the inconvenience :-(

Index: libstdc++-v3/ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	* libsupc++/Makefile.am (CXXLINK): Add --tag disable-shared after
	--tag CXX.
	(LIBTOOL): Let automake take care of its definition.
	* libsupc++/Makefile.in: Rebuilt.

Index: libstdc++-v3/libsupc++/Makefile.am
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/libsupc++/Makefile.am,v
retrieving revision 1.19.2.2
diff -u -p -r1.19.2.2 Makefile.am
--- libstdc++-v3/libsupc++/Makefile.am 2001/03/28 01:15:52 1.19.2.2
+++ libstdc++-v3/libsupc++/Makefile.am 2001/03/28 21:12:26
@@ -92,8 +92,6 @@ libsupc__convenience_la_SOURCES = $(sour
 glibcppinstalldir = @gxx_include_dir@
 glibcppinstall_HEADERS = $(headers)
 
-# Flags to force separate libtool library to be static only.
-LIBTOOL = @LIBTOOL@ --tag disable-shared
 LIBSUPCXX_CXXFLAGS = -prefer-pic
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
@@ -139,11 +137,6 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --ta
 # 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 $@
-
-
-
-
-
-
+CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \
+          --mode=link $(CXX) \
+          @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@

-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                  aoliva@{cygnus.com, redhat.com}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist    *Please* write to mailing lists, not to me

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]