1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix out-of-order inclusion of -L switches from LDFLAGS on AIX and HPUX.

Browse Source 
Per example from Dirk Pirschel.
This commit is contained in:
Tom Lane 2005-12-03 20:17:00 +00:00
parent 22fff8b9f1
commit 22868b9e39
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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
# $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 # 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)) 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 # 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, # name of the library, LINK.shared to the command to link the library,
# and adjust SHLIB_LINK if necessary. # and adjust SHLIB_LINK if necessary.
@ -271,7 +274,7 @@ else # PORTNAME == aix
# AIX case # AIX case
$(shlib): lib$(NAME).a $(shlib): lib$(NAME).a
$(MKLDEXPORT) lib$(NAME).a > lib$(NAME)$(EXPSUFF) $(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 endif # PORTNAME == aix