From: Albert Chin-A-Young <china@thewrittenword.com>
Date: Fri, 18 Mar 2005 14:39:48 +0000 (+0000)
Subject: * libtool.m4 (AC_LIBTOOL_LANG_CXX_CONFIG) [ solaris2.6+ ]:
X-Git-Tag: release-1-5-16~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=175ec60b80b9f1c59fe98f88abae319b36b37c5a;p=thirdparty%2Flibtool.git

* libtool.m4 (AC_LIBTOOL_LANG_CXX_CONFIG) [ solaris2.6+ ]:
When linking convenience libraries on Solaris with the Sun C++
compiler, pass convenience libraries through to the linker with
-Qoption between allextract/defaultextract.  The Sun C++ compiler
bundles -Qoption arguments so convenience libraries are linked with
defaultextract otherwise.
Backport of branch-2-0 patch dated 2004-03-14.
---

diff --git a/ChangeLog b/ChangeLog
index 6781eb5b9..e0e85579b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-03-18  Albert Chin-A-Young  <china@thewrittenword.com>
+
+	* libtool.m4 (AC_LIBTOOL_LANG_CXX_CONFIG) [ solaris2.6+ ]:
+	When linking convenience libraries on Solaris with the Sun C++
+	compiler, pass convenience libraries through to the linker with
+	-Qoption between allextract/defaultextract.  The Sun C++ compiler
+	bundles -Qoption arguments so convenience libraries are linked with
+	defaultextract otherwise.
+	Backport of branch-2-0 patch dated 2004-03-14.
+
 2005-03-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* ltmain.in: unconditionally set IFS, and set it
diff --git a/libtool.m4 b/libtool.m4
index 392c26035..9ec7a8b22 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -3422,9 +3422,13 @@ case $host_os in
 	  *)
 	    # The C++ compiler is used as linker so we must use $wl
 	    # flag to pass the commands to the underlying system
-	    # linker.
+	    # linker. We must also pass each convience library through
+	    # to the system linker between allextract/defaultextract.
+	    # The C++ compiler will combine linker options so we
+	    # cannot just pass the convience library names through
+	    # without $wl.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
 	    ;;
 	esac
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes