database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-18 17:41:14 +03:00
Code

Back-patch recent changes to alter the order of -L flags inserted from

Browse Source 
LDFLAGS versus those built into the Makefiles.  This looks like it will
fix several buildfarm failures in the back branches.
This commit is contained in:
Tom Lane 2005-07-17 04:06:04 +00:00
parent 6ec28d8503
commit 86494de248
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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 2003/10/20 01:34:33 tgl Exp $ # $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.72.2.1 2005/07/17 04:06:04 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -65,6 +65,9 @@ LINK.static = $(AR) $(AROPT)
ifeq ($(enable_shared), yes) 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))
# 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.
@ -207,7 +210,6 @@ ifeq ($(PORTNAME), beos)
SHLIB_LINK += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86 SHLIB_LINK += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86
endif endif
SHLIB_LINK := $(filter -L%, $(LDFLAGS)) $(SHLIB_LINK)
ifeq ($(enable_rpath), yes) ifeq ($(enable_rpath), yes)
SHLIB_LINK += $(rpath) SHLIB_LINK += $(rpath)
endif endif