diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-12-03 20:16:50 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-12-03 20:16:50 +0000 |
| commit | 91ab1fefbda055b591dc931458d29ffdc196fd80 (patch) | |
| tree | f2a8ff0affbd145fefa6eab94626f36daa69386a /src | |
| parent | b0be56634bb36ef320d84d229070c1fa05d8a97e (diff) | |
| download | postgresql-91ab1fefbda055b591dc931458d29ffdc196fd80.tar.gz postgresql-91ab1fefbda055b591dc931458d29ffdc196fd80.zip | |
Fix out-of-order inclusion of -L switches from LDFLAGS on AIX and HPUX.
Per example from Dirk Pirschel.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.shlib | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 2fbe1171598..bdb0f700d3b 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.90.4.1 2005/07/17 04:05:47 tgl Exp $ +# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.90.4.2 2005/12/03 20:16:50 tgl Exp $ # #------------------------------------------------------------------------- @@ -76,6 +76,9 @@ ifeq ($(enable_shared), yes) # Insert -L from LDFLAGS after any -L already present in SHLIB_LINK SHLIB_LINK := $(filter -L%, $(SHLIB_LINK)) $(filter -L%, $(LDFLAGS)) $(filter-out -L%, $(SHLIB_LINK)) +# Need a -L-free version of LDFLAGS to use in combination with SHLIB_LINK +LDFLAGS_NO_L := $(filter-out -L%, $(LDFLAGS)) + # Default shlib naming convention used by the majority of platforms shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) shlib_major = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) @@ -157,7 +160,7 @@ ifeq ($(PORTNAME), hpux) SHLIB_LINK += `$(CC) $(LDFLAGS) -print-libgcc-file-name` endif ifeq ($(with_gnu_ld), yes) - LINK.shared = $(CC) $(LDFLAGS) -shared -Wl,-h -Wl,$(soname) + LINK.shared = $(CC) $(LDFLAGS_NO_L) -shared -Wl,-h -Wl,$(soname) else # can't use the CC-syntax rpath pattern here rpath = @@ -303,7 +306,7 @@ else # PORTNAME == aix # AIX case $(shlib): lib$(NAME).a $(MKLDEXPORT) lib$(NAME).a > lib$(NAME)$(EXPSUFF) - $(COMPILER) $(LDFLAGS_SL) -o $@ $< $(LDFLAGS) $(SHLIB_LINK) -Wl,-bI:$(top_builddir)/src/backend/$(POSTGRES_IMP) -Wl,-bE:lib$(NAME)$(EXPSUFF) + $(COMPILER) $(LDFLAGS_SL) -o $@ $< $(LDFLAGS_NO_L) $(SHLIB_LINK) -Wl,-bI:$(top_builddir)/src/backend/$(POSTGRES_IMP) -Wl,-bE:lib$(NAME)$(EXPSUFF) endif # PORTNAME == aix |