diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 1999-07-23 11:58:49 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 1999-07-23 11:58:49 +0000 |
| commit | 10fe462b693e2ffd8a151aec63396fd00eabf93a (patch) | |
| tree | 54b9a35ecbdce7afc4cae82642d6de2a4a7e0d11 /Makefile.SH | |
| parent | 28e691b050cb6def1adfea314deb5e75572336e2 (diff) | |
| download | perl-10fe462b693e2ffd8a151aec63396fd00eabf93a.tar.gz | |
Introduce $Config{ldlibpthname} which contains
the name of the environment variable holding the
dynamic library search path, often LD_LIBRARY_PATH.
Use this new feature all over.
Also removed remnants of admonition "add LD_LIBRARY_PATH
before running make" because Makefile.SH does this for you.
p4raw-id: //depot/cfgperl@3725
Diffstat (limited to 'Makefile.SH')
| -rw-r--r-- | Makefile.SH | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/Makefile.SH b/Makefile.SH index 267a5334c1..79953c7709 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -29,29 +29,20 @@ ldlibpth='' case "$useshrplib" in true) # Prefix all runs of 'miniperl' and 'perl' with - # $ldlibpth so that ./perl finds *this* libperl.so. + # $ldlibpth so that ./perl finds *this* shared libperl. ldlibpth="LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH" pldlflags="$cccdlflags" - # NeXT-4 specific stuff. Can't we do this in the hint file? case "${osname}${osvers}" in next4*) ld=libtool lddlflags="-dynamic -undefined warning -framework System \ -compatibility_version 1 -current_version $patchlevel \ -prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@" - # NeXT uses a different name. - ldlibpth="DYLD_LIBRARY_PATH=`pwd`:$DYLD_LIBRARY_PATH" ;; - rhapsody*) - ldlibpth="DYLD_LIBRARY_PATH=`pwd`/Perl:$DYLD_LIBRARY_PATH" - ;; - cygwin*) ldlibpth="PATH='`pwd`:$PATH'" + cygwin*) linklibperl="-lperl" ;; - os2*) # OS/2 doesn't need anything special for LD_LIBRARY_PATH. - ldlibpth='' - ;; sunos*) linklibperl="-lperl" ;; @@ -68,15 +59,27 @@ true) esac shrpldflags="$shrpldflags $ldflags $libs $cryptlib" linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl" - ldlibpth="LIBPATH=`pwd`:${LIBPATH}" ;; 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" ;; esac + case "$ldlibpthname" in + '') ;; + *) + case "$osname" in + os2) + ldlibpth='' + ;; + rhapsody) + eval "ldlibpth=\"$ldlibpthname=`pwd`/Perl:\$$ldlibpthname\"" + ;; + *) + eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\"" + ;; + esac + ;; + esac ;; *) pldlflags='' ;; @@ -152,7 +155,7 @@ LLIBPERL= $linklibperl SHRPENV = $shrpenv # The following is used to include the current directory in -# LD_LIBRARY_PATH if you are building a shared libperl.so. +# the dynamic loader path you are building a shared libperl. LDLIBPTH = $ldlibpth dynamic_ext = $dynamic_list |