From 12e7558c7683ddc41a362fea7d1f3f04ac8c0d0c Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 20 Oct 2000 23:57:34 +0000
Subject: Add check for GNU or not GNU ld, needed to pick the right
 export_dynamic flags for Solaris.  The test itself is straight from libtool.

---
 src/Makefile.global.in         | 4 +++-
 src/makefiles/Makefile.solaris | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index dac5cf0aa58..da9cd4e990e 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.101 2000/10/20 21:03:38 petere Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.102 2000/10/20 23:57:33 petere Exp $
 
 #------------------------------------------------------------------------------
 # All PostgreSQL makefiles include this file and use the variables it sets,
@@ -160,6 +160,8 @@ FLEXFLAGS = @FLEXFLAGS@ $(LFLAGS)
 
 AROPT = @AROPT@
 LIBS = @LIBS@
+LD = @LD@
+with_gnu_ld = @with_gnu_ld@
 LDFLAGS = @LDFLAGS@ $(LIBS)
 KRB_LIBS = @KRB_LIBS@
 LDREL = -r
diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
index 034e4e224f4..19ef50188b3 100644
--- a/src/makefiles/Makefile.solaris
+++ b/src/makefiles/Makefile.solaris
@@ -1,4 +1,8 @@
-# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.1 2000/10/10 21:22:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.2 2000/10/20 23:57:34 petere Exp $
+
+ifeq ($(with_gnu_ld), yes)
+export_dynamic = -Wl,-E
+endif
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
-- 
cgit v1.2.3