rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up rpath handling for HPUX --- we can't use the cc-style rpath 

switch syntax when calling ld directly.
This commit is contained in:
Tom Lane 2004-11-19 21:27:42 +00:00
parent 466fb06739
commit 8e57975219
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile.shlib
View File

@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California # Copyright (c) 1998, Regents of the University of California
# #
# IDENTIFICATION # IDENTIFICATION
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.88 2004/11/17 17:08:15 tgl Exp $ # $PostgreSQL: pgsql/src/Makefile.shlib,v 1.89 2004/11/19 21:27:42 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -154,9 +154,15 @@ ifeq ($(PORTNAME), hpux)
SHLIB_LINK += `$(CC) $(LDFLAGS) -print-libgcc-file-name` SHLIB_LINK += `$(CC) $(LDFLAGS) -print-libgcc-file-name`
endif endif
ifeq ($(with_gnu_ld), yes) ifeq ($(with_gnu_ld), yes)
LINK.shared = $(CC) $(LDFLAGS) -shared -Wl,-h -Wl,$(soname) -Wl,+b -Wl,$(libdir) LINK.shared = $(CC) $(LDFLAGS) -shared -Wl,-h -Wl,$(soname)
else else
LINK.shared = $(LD) +h $(soname) -b +b $(libdir) # can't use the CC-syntax rpath pattern here
rpath =
ifeq ($(enable_rpath), yes)
LINK.shared = $(LD) +h $(soname) -b +b $(rpathdir)
else
LINK.shared = $(LD) +h $(soname) -b
endif
endif endif
endif endif

4
src/makefiles/Makefile.hpux
View File

@ -19,9 +19,9 @@ LIBS := -lxnet $(LIBS)
# Set up rpath so that the executables don't need SHLIB_PATH to be set. # 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...) # (Note: --disable-rpath is a really bad idea on this platform...)
ifeq ($(with_gnu_ld), yes) ifeq ($(with_gnu_ld), yes)
rpath = -Wl,-rpath,$(rpathdir) rpath = -Wl,-rpath -Wl,$(rpathdir)
else else
rpath = -Wl,+b,$(rpathdir) rpath = -Wl,+b -Wl,$(rpathdir)
endif endif
# catch null pointer dereferences # catch null pointer dereferences