diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-12-03 20:17:00 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-12-03 20:17:00 +0000 |
commit | 22868b9e39668d7cd067eb2406ae6c95c8d31b5b (patch) | |
tree | 7ef8ecf70ccb8964cf9cadfaf63aead0d0529fcd | |
parent | 22fff8b9f1a98fc1f431340fb069b2851271a8ba (diff) | |
download | postgresql-22868b9e39668d7cd067eb2406ae6c95c8d31b5b.tar.gz |
Fix out-of-order inclusion of -L switches from LDFLAGS on AIX and HPUX.
Per example from Dirk Pirschel.
-rw-r--r-- | src/Makefile.shlib | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 1de2fbaf6f..a263b61d08 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.72.2.1 2005/07/17 04:06:04 tgl Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.72.2.2 2005/12/03 20:17:00 tgl Exp $ # #------------------------------------------------------------------------- @@ -68,6 +68,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)) + # For each platform we support shared libraries on, set shlib to the # name of the library, LINK.shared to the command to link the library, # and adjust SHLIB_LINK if necessary. @@ -271,7 +274,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 |