hpux needs {SHLIB_PATH,LDOPTS} rather than LD_{LIBRARY,RUN}_PATH

(as suggested by Eric Boehm <boehm@nortelnetworks.com>)

p4raw-id: //depot/perl@3341

diff --git a/Configure b/Configure
index a56b94f..3aa2aaa 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -5448,6 +5448,10 @@ if "$useshrplib"; then
        beos)
                # beos doesn't like the default, either.
                ;;
+       hpux*)
+               # hpux doesn't like the default, either.
+               tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\""
+               ;;
        *)
                tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
                ;;

diff --git a/Makefile.SH b/Makefile.SH
index 1ba5e80..ae96f30 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -68,8 +68,9 @@ true)
                aixinstdir=`pwd | sed 's/\/UU$//'`
                linklibperl="-L $archlibexp/CORE -L $aixinstdir -lperl"
                ;;
-       hpux10*|hpux11*)
-               linklibperl="-L `pwd | sed 's/\/UU$//'` -Wl,+b$archlibexp/CORE -lperl"
+       hpux*)
+               linklibperl="-L `pwd | sed 's/\/UU$//'` -Wl,+s -Wl,+b$archlibexp/CORE -lperl"
+               ldlibpth="SHLIB_PATH=`pwd`:${SHLIB_PATH}"
                ;;
        beos*)  ldlibpth="LIBRARY_PATH=`pwd`:$LIBRARY_PATH"
                ;;