* libtool.m4 (CXX, archive_cmds) [sun]: Add -lCstd, -lCrun

and -lc for c++ builds with Sun C++ and Centerline C++..
Reported by Albert Chin-A-Young <china@hewrittenword.com>

diff --git a/ChangeLog b/ChangeLog
index b51c6e7723fe4d087b84400565c62e797a0265fb..9fc18fac9fbf45370d7aee2d66492ee4c274523b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-24  Peter O'Gorman  <peter@pogma.com>
+
+       * libtool.m4 (CXX, archive_cmds) [sun]: Add -lCstd, -lCrun
+       and -lc for c++ builds with Sun C++ and Centerline C++..
+       Reported by Albert Chin-A-Young <china@hewrittenword.com>
+
 2005-07-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
        * libltdl/Makefile.am (local-install-files): Have root own of

diff --git a/libtool.m4 b/libtool.m4
index b5613e46556409d8f04e09604867e9d3b064b058..6d6906cf78e411762ec0738de4bfca8e8b4e1eaa 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -3475,10 +3475,12 @@ case $host_os in
     case $cc_basename in
       CC*)
        # Sun C++ 4.2, 5.x and Centerline C++
+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+        _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
        _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-       $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+       $CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -3498,15 +3500,7 @@ case $host_os in
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
-       #
-       # There doesn't appear to be a way to prevent this compiler from
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
-       output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+       output_verbose_link_cmd='echo'
 
        # Archives containing C++ object files must be created using
        # "CC -xar", where "CC" is the Sun C++ compiler.  This is