* m4/libtool.m4 [sun, CC] (_LT_LANG_CXX_CONFIG): Move postdeps

override ..
(_LT_SYS_HIDDEN_LIBDEPS): ..here.
* TODO: Updated.

diff --git a/ChangeLog b/ChangeLog
index 980bbc7b115d0757546d32d6abeebc5d0698701f..cc36c026d50f30f961a5de0d0cbaaae7188c023c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * m4/libtool.m4 [sun, CC] (_LT_LANG_CXX_CONFIG): Move postdeps
+       override ..
+       (_LT_SYS_HIDDEN_LIBDEPS): ..here.
+       * TODO: Updated.
+
 2005-08-18  Stepan Kasal  <kasal@ucw.cz>
 
        * config/general.m4sh (SP2NL, NL2SP): Simplify.

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 522f103c6fc06c9f439bd2789f369afa03811b65..84e18d926de9a5e0fdd1718971818e6094b6ef78 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -5551,7 +5551,6 @@ if test "$_lt_caught_CXX_error" != yes; then
           CC*)
            # Sun C++ 4.2, 5.x and Centerline C++
             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-            _LT_TAGVAR(postdeps,$1)='-lCstd -lCrun'
            _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
            _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
            _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
@@ -5834,6 +5833,18 @@ fi
 
 $RM -f confest.$objext
 
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+solaris*)
+  case $cc_basename in
+  CC*)
+    _LT_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    ;;
+  esac
+esac
+])
+
 case " $_LT_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac