|
6 | 6 | # Copyright (c) 1998, Regents of the University of California |
7 | 7 | # |
8 | 8 | # IDENTIFICATION |
9 | | -# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.98 2005/10/28 17:32:22 tgl Exp $ |
| 9 | +# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.99 2005/12/03 20:16:31 tgl Exp $ |
10 | 10 | # |
11 | 11 | #------------------------------------------------------------------------- |
12 | 12 |
|
@@ -76,6 +76,9 @@ ifeq ($(enable_shared), yes) |
76 | 76 | # Insert -L from LDFLAGS after any -L already present in SHLIB_LINK |
77 | 77 | SHLIB_LINK := $(filter -L%, $(SHLIB_LINK)) $(filter -L%, $(LDFLAGS)) $(filter-out -L%, $(SHLIB_LINK)) |
78 | 78 |
|
| 79 | +# Need a -L-free version of LDFLAGS to use in combination with SHLIB_LINK |
| 80 | +LDFLAGS_NO_L := $(filter-out -L%, $(LDFLAGS)) |
| 81 | + |
79 | 82 | # Default shlib naming convention used by the majority of platforms |
80 | 83 | shlib= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) |
81 | 84 | shlib_major= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) |
@@ -154,7 +157,7 @@ endif |
154 | 157 | ifeq ($(PORTNAME), hpux) |
155 | 158 | shlib= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) |
156 | 159 | ifeq ($(with_gnu_ld), yes) |
157 | | - LINK.shared= $(CC) $(LDFLAGS) -shared -Wl,-h -Wl,$(soname) |
| 160 | + LINK.shared= $(CC) $(LDFLAGS_NO_L) -shared -Wl,-h -Wl,$(soname) |
158 | 161 | else |
159 | 162 | # can't use the CC-syntax rpath pattern here |
160 | 163 | rpath = |
@@ -309,7 +312,7 @@ else # PORTNAME == aix |
309 | 312 | # AIX case |
310 | 313 | $(shlib): lib$(NAME).a |
311 | 314 | $(MKLDEXPORT) lib$(NAME).a > lib$(NAME)$(EXPSUFF) |
312 | | -$(COMPILER) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $< -Wl,-bE:lib$(NAME)$(EXPSUFF) $(SHLIB_LINK) |
| 315 | +$(COMPILER) $(LDFLAGS_NO_L) $(LDFLAGS_SL) -o $@ $< -Wl,-bE:lib$(NAME)$(EXPSUFF) $(SHLIB_LINK) |
313 | 316 |
|
314 | 317 | endif # PORTNAME == aix |
315 | 318 |
|
|