summaryrefslogtreecommitdiff
path: root/src/Makefile.shlib
diff options
context:
space:
mode:
authorTom Lane2004-09-02 23:06:43 +0000
committerTom Lane2004-09-02 23:06:43 +0000
commit346900e83b81cb29f5e948253a56ad3eca84b5e9 (patch)
tree0fe8578bade9df024adfcd313517e65f38d7b7fb /src/Makefile.shlib
parentcb792343074d026b307cc1fdde1a679abaa27a24 (diff)
Fix shared library linking operations to work properly on all (or at
least more) combinations of HP-UX hardware, compiler, and linker. Shinji Teragaito and Tom Lane.
Diffstat (limited to 'src/Makefile.shlib')
-rw-r--r--src/Makefile.shlib8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 0d7283ce3ea..555c97d88c4 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California
#
# IDENTIFICATION
-# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.77 2004/07/13 00:06:46 tgl Exp $
+# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.78 2004/09/02 23:06:43 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -148,10 +148,14 @@ endif
ifeq ($(PORTNAME), hpux)
shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
- LINK.shared = $(LD) +h $(soname) -b +b $(libdir)
ifeq ($(GCC), yes)
SHLIB_LINK += `$(CC) -print-libgcc-file-name`
endif
+ ifeq ($(with_gnu_ld), yes)
+ LINK.shared = $(CC) $(LDFLAGS) -shared -Wl,-h -Wl,$(soname)
+ else
+ LINK.shared = $(LD) +h $(soname) -b +b $(libdir)
+ endif
endif
ifeq ($(PORTNAME), irix)