From: Albert Chin-A-Young <china@thewrittenword.com>
Date: Thu, 10 Nov 2005 18:29:38 +0000 (+0000)
Subject: * libtool.m4 (AC_LIBTOOL_LANG_CXX_CONFIG) [ hpux10, hpux11 ]
X-Git-Tag: release-1-5-22~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0292e75074cc50b9eee46e4a51bbb7b7b72edeeb;p=thirdparty%2Flibtool.git

* libtool.m4 (AC_LIBTOOL_LANG_CXX_CONFIG) [ hpux10, hpux11 ]
<hppa*64,ia64, aCC,g++>:
Use C++ compiler for linking rather than ld.
---

diff --git a/ChangeLog b/ChangeLog
index 24fd4c69b..e3834decf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-10  Albert Chin-A-Young  <china@thewrittenword.com>
+
+	* libtool.m4 (AC_LIBTOOL_LANG_CXX_CONFIG) [ hpux10, hpux11 ]
+	<hppa*64,ia64, aCC,g++>:
+	Use C++ compiler for linking rather than ld.
+
 2005-11-09  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
 	* libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS): Move setting of
diff --git a/libtool.m4 b/libtool.m4
index b3f200bb7..22a898dab 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -3171,7 +3171,7 @@ case $host_os in
       aCC*)
 	case $host_cpu in
 	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	  ;;
 	*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -3192,7 +3192,7 @@ case $host_os in
 	  if test $with_gnu_ld = no; then
 	    case $host_cpu in
 	    ia64*|hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      ;;
 	    *)
 	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'