diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 2 | ||||
| -rw-r--r-- | src/Makefile.shlib | 2 | ||||
| -rw-r--r-- | src/bin/pg_upgrade/test.sh | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index d39d6ca8670..59bd7996d18 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -344,7 +344,7 @@ endef # platform-specific environment variable to set shared library path define ld_library_path_var -$(if $(filter $(PORTNAME),darwin),DYLD_LIBRARY_PATH,$(if $(filter $(PORTNAME),aix),LIBPATH,LD_LIBRARY_PATH)) +$(if $(filter $(PORTNAME),darwin),DYLD_LIBRARY_PATH,$(if $(filter $(PORTNAME),aix),LIBPATH,$(if $(filter $(PORTNAME),hpux),SHLIB_PATH,LD_LIBRARY_PATH))) endef define with_temp_install diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 358d90837ce..c293a34d1aa 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -193,7 +193,7 @@ ifeq ($(PORTNAME), hpux) # can't use the CC-syntax rpath pattern here, so instead: rpath = ifeq ($(enable_rpath), yes) - LINK.shared += +b '$(rpathdir)' + LINK.shared += +s +b '$(rpathdir)' endif # On HPUX platforms, gcc is usually configured to search for libraries # in /usr/local/lib, but ld won't do so. Add an explicit -L switch so diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh index 8589dbf5b3d..cbc52595502 100644 --- a/src/bin/pg_upgrade/test.sh +++ b/src/bin/pg_upgrade/test.sh @@ -83,6 +83,8 @@ if [ "$1" = '--install' ]; then export DYLD_LIBRARY_PATH LIBPATH=$libdir:$LIBPATH export LIBPATH + SHLIB_PATH=$libdir:$SHLIB_PATH + export SHLIB_PATH PATH=$libdir:$PATH # We need to make it use psql from our temporary installation, |