From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 18 Aug 2005 06:18:01 +0000 (+0000)
Subject: * libtool.m4 [sun, CC] (AC_LIBTOOL_LANG_CXX_CONFIG): Move
X-Git-Tag: release-1-5-20~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70e40e21db51d5960d592d813e755d28bf9342bc;p=thirdparty%2Flibtool.git

* libtool.m4 [sun, CC] (AC_LIBTOOL_LANG_CXX_CONFIG): Move
postdeps override ..
(AC_LIBTOOL_POSTDEP_PREDEP): ..here, so they actually override.
---

diff --git a/ChangeLog b/ChangeLog
index 72db9f760..2e77eadb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* libtool.m4 [sun, CC] (AC_LIBTOOL_LANG_CXX_CONFIG): Move
+	postdeps override ..
+	(AC_LIBTOOL_POSTDEP_PREDEP): ..here, so they actually override.
+
 2005-08-18  Stepan Kasal  <kasal@ucw.cz>
 
 	* ltmain.in (SP2NL, NL2SP): Simplify.
diff --git a/libtool.m4 b/libtool.m4
index 7fd1c0c2f..575e22fdc 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -3476,7 +3476,6 @@ case $host_os 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}  -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~
@@ -3737,6 +3736,18 @@ fi
 
 $rm -f confest.$objext
 
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+solaris*)
+  case $cc_basename in
+  CC*)
+    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    ;;
+  esac
+esac
+])
+
 case " $_LT_AC_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac