diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-07-13 02:11:57 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-07-13 02:11:57 +0000 |
| commit | 5bced8f5cb94e5c7fdd952b09e4dd1a86134e4c4 (patch) | |
| tree | 82c871d4f425e2391cb67763de0ce0439197789c /src | |
| parent | d6375d6109518723142d1d716ae4fd0140446554 (diff) | |
| download | postgresql-5bced8f5cb94e5c7fdd952b09e4dd1a86134e4c4.tar.gz postgresql-5bced8f5cb94e5c7fdd952b09e4dd1a86134e4c4.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.shlib | 4 |
1 files 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 |