From 1f9010cc8d4fa0445e75b05d512dc62fa1ce7d2d Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 5 Apr 2002 12:01:59 +0000
Subject: [PATCH] > > This patch corrects the use of rpath and export options
 when compiling > > on postgres on Unixware with GCC built with gnu-as and
 gnu-ld.

Remove leading spaces in conditional tests in patch and Makefile.aix.

Nicolas Bazin
---
 src/makefiles/Makefile.aix      | 16 ++++++++--------
 src/makefiles/Makefile.unixware | 13 +++++++++++--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix
index 7c89e975bc..0044a8f3ca 100644
--- a/src/makefiles/Makefile.aix
+++ b/src/makefiles/Makefile.aix
@@ -8,11 +8,11 @@ AROPT = crs
 
 DLSUFFIX = .so
 ifneq ($(GCC), yes)
-  ifeq ($(host_os), aix3.2.5)
-    LDFLAGS_SL = -e _nostart
-  else
-    LDFLAGS_SL = -bnoentry
-  endif
+ifeq ($(host_os), aix3.2.5)
+	LDFLAGS_SL = -e _nostart
+else
+	LDFLAGS_SL = -bnoentry
+endif
 endif
 
 
@@ -28,11 +28,11 @@ $(POSTGRES_IMP):
 ifeq ($(host_os), aix3.2.5)
 	$(MKLDEXPORT) postgres $(bindir) > $@
 else
-  ifneq (,$(findstring aix4.1, $(host_os)))
+ifneq (,$(findstring aix4.1, $(host_os)))
 	$(MKLDEXPORT) postgres $(bindir) > $@
-  else
+else
 	$(MKLDEXPORT) postgres . > $@
-  endif
+endif
 endif
 	$(CC) -Wl,-bE:$(top_builddir)/src/backend/$@ -o postgres $(OBJS) $(LDFLAGS) $(LIBS)
 
diff --git a/src/makefiles/Makefile.unixware b/src/makefiles/Makefile.unixware
index 92888e1806..5722c46a17 100644
--- a/src/makefiles/Makefile.unixware
+++ b/src/makefiles/Makefile.unixware
@@ -1,7 +1,16 @@
 AROPT = crs
-export_dynamic = -Wl,-Bexport
+ifeq ($(with_gnu_ld), yes)
+	export_dynamic = -Wl,-E
+else
+	export_dynamic = -Wl,-Bexport
+endif
+
 ifeq ($(ld_R_works), yes)
-rpath = -Wl,-R$(libdir)
+ifeq ($(with_gnu_ld), yes)
+	rpath = -Wl,-rpath,$(libdir)
+else
+	rpath = -Wl,-R$(libdir)
+endif
 endif
 shlib_symbolic = -Wl,-Bsymbolic
 
-- 
2.40.0