From 63b234f968fa113e4e9d7254e4a36702bfb4716c Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <aoliva@redhat.com>
Date: Tue, 6 Mar 2001 11:14:53 +0000
Subject: [PATCH] * ltcf-cxx.sh (archive_cmds) [HP-UX, GCC]: Port.

---
 ChangeLog   |  4 ++++
 ltcf-cxx.sh | 25 ++++++++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b3e0e753..2dc0574c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-06  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltcf-cxx.sh (archive_cmds) [HP-UX, GCC]: Port.
+
 2001-03-06  Gary Vaughan  <gvv@techie.com>
 
 	From Albert Chin-A-Young <china@thewrittenword.com>
diff --git a/ltcf-cxx.sh b/ltcf-cxx.sh
index 19f5e73e4..395b998f8 100644
--- a/ltcf-cxx.sh
+++ b/ltcf-cxx.sh
@@ -239,6 +239,13 @@ case $host_os in
     ld_shlibs=no
     ;;
   hpux*)
+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+    hardcode_libdir_separator=:
+    hardcode_direct=yes
+    hardcode_minus_L=yes # Not in the search PATH, but as the default
+			 # location of the library.
+    export_dynamic_flag_spec='${wl}-E'
+
     case $cc_basename in
       CC)
         # FIXME: insert proper C++ library support
@@ -249,13 +256,6 @@ case $host_os in
 	hpux9*) archive_cmds='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
 	*) archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;;
 	esac
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_minus_L=yes # Not in the search PATH, but as the default
-			     # location of the library.
-	export_dynamic_flag_spec='${wl}-E'
-
         # Commands to make compiler produce verbose output that lists
         # what "hidden" libraries, object files and flags are used when
         # linking a shared library.
@@ -267,8 +267,15 @@ case $host_os in
         output_verbose_link_cmds='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
         ;;
       *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs=no
+        if test $with_gcc = yes; then
+	  case "$host_os" in
+	  hpux9*) archive_cmds='$rm $output_objdir/$soname~$CC -shared ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+	  *) archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;;
+	  esac
+	else
+	  # FIXME: insert proper C++ library support
+          ld_shlibs=no
+	fi
         ;;
     esac
     ;;
-- 
2.47.3