summaryrefslogtreecommitdiff
path: root/src/makefiles/Makefile.hpux
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2004-11-19 00:41:39 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2004-11-19 00:41:39 +0000
commita9ddd649df46afde8f26dd9f85f05292e8da1f4b (patch)
treed1dd63d725cd92adc627418d73ea76e31ce93da4 /src/makefiles/Makefile.hpux
parentb6038484f8c9bb2760c4a5c285b67d4eebeb30b4 (diff)
downloadpostgresql-a9ddd649df46afde8f26dd9f85f05292e8da1f4b.tar.gz
Modify the platform-specific makefiles so that macro 'rpath' is defined
in terms of macro 'rpathdir', as I proposed a few weeks ago. In itself this commit shouldn't change the behavior at all, but it opens the door to using special rpaths for the PL shared libraries, as seems to be needed for plperl in particular.
Diffstat (limited to 'src/makefiles/Makefile.hpux')
-rw-r--r--src/makefiles/Makefile.hpux10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/makefiles/Makefile.hpux b/src/makefiles/Makefile.hpux
index 2ffd791e40..4a1e551ec1 100644
--- a/src/makefiles/Makefile.hpux
+++ b/src/makefiles/Makefile.hpux
@@ -16,14 +16,12 @@ endif
# correctly in the LP64 data model.
LIBS := -lxnet $(LIBS)
-# Embed 'libdir' as the shared library search path so that the executables
-# don't need SHLIB_PATH to be set. (We do not observe the --enable-rpath
-# switch here because you'd get rather bizarre behavior if you leave this
-# option off.)
+# Set up rpath so that the executables don't need SHLIB_PATH to be set.
+# (Note: --disable-rpath is a really bad idea on this platform...)
ifeq ($(with_gnu_ld), yes)
- LDFLAGS += -Wl,-rpath -Wl,$(libdir)
+ rpath = -Wl,-rpath,$(rpathdir)
else
- LDFLAGS += -Wl,+b -Wl,$(libdir)
+ rpath = -Wl,+b,$(rpathdir)
endif
# catch null pointer dereferences