postgres.git / summary / log / commit / refs

commit    5bced8f5cb94e5c7fdd952b09e4dd1a86134e4c4
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Wed Jul 13 02:11:57 2005 +0000
First released in: 8.1.0

    Move -L flag around for shared builds:
    
    I wrote:
    > So either we code up some intelligence to put the "C" in the right
    > position or we have to pass down "A B" and "D" separately from the
    > main makefile.
    
    The following patch might just do the former.  Please try it out.
    
    
    Peter E.


 src/Makefile.shlib | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 7e85e16329e..448de6f24a2 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.93 2005/07/12 23:06:48 tgl Exp $
+#    $PostgreSQL: pgsql/src/Makefile.shlib,v 1.94 2005/07/13 02:11:57 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -247,7 +247,7 @@ ifeq ($(PORTNAME), beos)
   SHLIB_LINK		+= -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86
 endif
 
-SHLIB_LINK := $(filter -L%, $(LDFLAGS)) $(SHLIB_LINK)
+SHLIB_LINK := $(filter -L%, $(SHLIB_LINK)) $(filter -L%, $(LDFLAGS)) $(filter-out -L%, $(SHLIB_LINK))
 ifeq ($(enable_rpath), yes)
 SHLIB_LINK += $(rpath)
 endif


[parent: d6375d610951]