From fc43dbcb8d3f84cfa2c17c92f0b10aa194eb305a Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 18 Aug 2005 06:17:06 +0000
Subject: [PATCH] * m4/libtool.m4 [sun, CC] (_LT_LANG_CXX_CONFIG): Move
 postdeps override .. (_LT_SYS_HIDDEN_LIBDEPS): ..here.

---
 ChangeLog     |  6 ++++++
 m4/libtool.m4 | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d85487497..9d5df9c0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 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 5270d4c13..44725b156 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -5502,7 +5502,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~
@@ -5785,6 +5784,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
-- 
2.47.2