Separate -Wl,-E or equivalent into separate make variable, since it's only

necessary for the postgres/postmaster link, not every link.

10 files changed, 12 insertions, 10 deletions

diff --git a/src/makefiles/Makefile.beos b/src/makefiles/Makefile.beos
index d9ebb4dee7f..bc8e9124626 100644
--- a/src/makefiles/Makefile.beos
+++ b/src/makefiles/Makefile.beos
@@ -1,6 +1,6 @@
 MK_NO_LORDER=true
 ifdef ELF_SYSTEM
-LDFLAGS += -Wl,-E
+export_dynamic = -Wl,-E
 CPPFLAGS+= -I$(top_srcdir)/src/backend/port/beos
 endif
 %.so: %.o
diff --git a/src/makefiles/Makefile.bsdi b/src/makefiles/Makefile.bsdi
index b1da0004cb7..a990758f6d7 100644
--- a/src/makefiles/Makefile.bsdi
+++ b/src/makefiles/Makefile.bsdi
@@ -2,7 +2,7 @@
 # if we defined .so in template/bsdi_4.0
 
 ifeq ($(DLSUFFIX), .so)
-LDFLAGS+= -export-dynamic
+export_dynamic = -export-dynamic
 endif
 
 %.so: %.o
diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd
index e242b54e596..cb73676c6ca 100644
--- a/src/makefiles/Makefile.freebsd
+++ b/src/makefiles/Makefile.freebsd
@@ -1,5 +1,5 @@
 ifdef ELF_SYSTEM
-LDFLAGS+=	-export-dynamic
+export_dynamic = -export-dynamic
 endif
 
 %.so: %.o
diff --git a/src/makefiles/Makefile.hpux b/src/makefiles/Makefile.hpux
index de2b87d6138..d93501e5d5f 100644
--- a/src/makefiles/Makefile.hpux
+++ b/src/makefiles/Makefile.hpux
@@ -23,7 +23,8 @@ endif
 # so that the executables don't need SHLIB_PATH to be set, specify -z
 # to catch null pointer dereferences, and specify -E to make all symbols
 # visible to dynamically linked shared libraries.
-LDFLAGS+= -Wl,+b -Wl,$(libdir) -Wl,-z -Wl,-E
+LDFLAGS+= -Wl,+b -Wl,$(libdir) -Wl,-z
+export_dynamic = -Wl,-E
 
 # Rule for building shared libs (currently used only for regression test
 # shlib ... should go away, since this is not really enough knowledge)
diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux
index 91e50d672db..d7f20ea86b0 100644
--- a/src/makefiles/Makefile.linux
+++ b/src/makefiles/Makefile.linux
@@ -1,4 +1,4 @@
-LDFLAGS+= -export-dynamic
+export_dynamic = -export-dynamic
 MK_NO_LORDER= true
 
 %.so: %.o
diff --git a/src/makefiles/Makefile.netbsd b/src/makefiles/Makefile.netbsd
index 14ebbfecf33..ef9fbbee641 100644
--- a/src/makefiles/Makefile.netbsd
+++ b/src/makefiles/Makefile.netbsd
@@ -1,5 +1,5 @@
 ifdef ELF_SYSTEM
-LDFLAGS += -Wl,-E
+export_dynamic = -Wl,-E
 endif
 %.so: %.o
 ifdef ELF_SYSTEM
diff --git a/src/makefiles/Makefile.openbsd b/src/makefiles/Makefile.openbsd
index 14ebbfecf33..ef9fbbee641 100644
--- a/src/makefiles/Makefile.openbsd
+++ b/src/makefiles/Makefile.openbsd
@@ -1,5 +1,5 @@
 ifdef ELF_SYSTEM
-LDFLAGS += -Wl,-E
+export_dynamic = -Wl,-E
 endif
 %.so: %.o
 ifdef ELF_SYSTEM
diff --git a/src/makefiles/Makefile.sco b/src/makefiles/Makefile.sco
index 325c9516bdf..f2e6108a082 100644
--- a/src/makefiles/Makefile.sco
+++ b/src/makefiles/Makefile.sco
@@ -1,5 +1,5 @@
 CFLAGS += -dy
-LDFLAGS += -W l,-Bexport
+export_dynamic = -W l,-Bexport
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
diff --git a/src/makefiles/Makefile.univel b/src/makefiles/Makefile.univel
index 4048f3977b5..1fc4ee65d8f 100644
--- a/src/makefiles/Makefile.univel
+++ b/src/makefiles/Makefile.univel
@@ -1,4 +1,5 @@
-LDFLAGS+= -lc89 -Wl,-Bexport
+LDFLAGS+= -lc89
+export_dynamic = -Wl,-Bexport
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
diff --git a/src/makefiles/Makefile.unixware b/src/makefiles/Makefile.unixware
index 442994ca4f7..51ca500bb1d 100644
--- a/src/makefiles/Makefile.unixware
+++ b/src/makefiles/Makefile.unixware
@@ -1,4 +1,4 @@
-LDFLAGS+= -Wl,-Bexport
+export_dynamic = -Wl,-Bexport
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<