From 86ec73b90932dd22e9e6c2333f1322130c4e1690 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Mon, 1 Sep 2008 08:50:10 +0000
Subject: [PATCH] Synchronize the shared object build rules in Makefile.port
with Makefile.shlib somewhat by adding CFLAGS where the compiler is used and
Makefile.shlib already used CFLAGS.
---
src/Makefile.shlib | 7 +++----
src/makefiles/Makefile.aix | 2 +-
src/makefiles/Makefile.bsdi | 2 +-
src/makefiles/Makefile.freebsd | 2 +-
src/makefiles/Makefile.irix | 2 +-
src/makefiles/Makefile.linux | 2 +-
src/makefiles/Makefile.netbsd | 2 +-
src/makefiles/Makefile.openbsd | 2 +-
src/makefiles/Makefile.solaris | 8 ++++++--
9 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 4e795e32fe3..5bf5b818c1d 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.116 2008/04/08 09:50:29 petere Exp $
+# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.117 2008/09/01 08:50:09 petere Exp $
#
#-------------------------------------------------------------------------
@@ -256,10 +256,9 @@ endif
ifeq ($(PORTNAME), solaris)
ifeq ($(GCC), yes)
- LINK.shared = $(COMPILER) -shared # $(COMPILER) needed for -m64
+ LINK.shared = $(COMPILER) -shared
else
-# CFLAGS added for X86_64
- LINK.shared = $(CC) -G $(CFLAGS)
+ LINK.shared = $(COMPILER) -G
endif
ifdef soname
ifeq ($(with_gnu_ld), yes)
diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix
index ea825a7ca6b..35d45237f5f 100644
--- a/src/makefiles/Makefile.aix
+++ b/src/makefiles/Makefile.aix
@@ -38,6 +38,6 @@ MKLDEXPORT=$(top_srcdir)/src/backend/port/aix/mkldexport.sh
$(MKLDEXPORT) $^ >$@
%$(DLSUFFIX): %.o %.exp
- $(CC) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*.exp $(SHLIB_LINK)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*.exp $(SHLIB_LINK)
sqlmansect = 7
diff --git a/src/makefiles/Makefile.bsdi b/src/makefiles/Makefile.bsdi
index 47b1274055c..0ce07041236 100644
--- a/src/makefiles/Makefile.bsdi
+++ b/src/makefiles/Makefile.bsdi
@@ -21,6 +21,6 @@ CFLAGS_SL =
endif
%.so: %.o
- $(CC) -shared -o $@ $<
+ $(CC) $(CFLAGS) -shared -o $@ $<
sqlmansect = 7
diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd
index f6e57608064..201dcd6f4cd 100644
--- a/src/makefiles/Makefile.freebsd
+++ b/src/makefiles/Makefile.freebsd
@@ -16,7 +16,7 @@ endif
%.so: %.o
ifdef ELF_SYSTEM
- $(LD) -x -shared -o $@ $<
+ $(CC) $(CFLAGS) -shared -o $@ $<
else
$(LD) $(LDREL) $(LDOUT) $<.obj -x $<
@echo building shared object $@
diff --git a/src/makefiles/Makefile.irix b/src/makefiles/Makefile.irix
index 2a23c5a8fd4..145653860e1 100644
--- a/src/makefiles/Makefile.irix
+++ b/src/makefiles/Makefile.irix
@@ -6,7 +6,7 @@ DLSUFFIX = .so
CFLAGS_SL =
%.so: %.o
- $(LD) -G -Bdynamic -shared -o $@ $<
+ $(CC) $(CFLAGS) -shared -o $@ $<
override CPPFLAGS += -U_NO_XOPEN4
diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux
index 8766d18f614..0fadd273104 100644
--- a/src/makefiles/Makefile.linux
+++ b/src/makefiles/Makefile.linux
@@ -11,6 +11,6 @@ CFLAGS_SL = -fpic
endif
%.so: %.o
- $(CC) -shared -o $@ $<
+ $(CC) $(CFLAGS) -shared -o $@ $<
sqlmansect = 7
diff --git a/src/makefiles/Makefile.netbsd b/src/makefiles/Makefile.netbsd
index db33ebff78e..820e33074f1 100644
--- a/src/makefiles/Makefile.netbsd
+++ b/src/makefiles/Makefile.netbsd
@@ -18,7 +18,7 @@ endif
%.so: %.o
ifdef ELF_SYSTEM
- $(LD) -x -Bshareable -o $@ $<
+ $(CC) $(CFLAGS) -shared -o $@ $<
else
$(LD) $(LDREL) $(LDOUT) $<.obj -x $<
@echo building shared object $@
diff --git a/src/makefiles/Makefile.openbsd b/src/makefiles/Makefile.openbsd
index 24e201836e9..7c6765c6570 100644
--- a/src/makefiles/Makefile.openbsd
+++ b/src/makefiles/Makefile.openbsd
@@ -16,7 +16,7 @@ endif
%.so: %.o
ifdef ELF_SYSTEM
- $(CC) -shared -o $@ $<
+ $(CC) $(CFLAGS) -shared -o $@ $<
else
$(LD) $(LDREL) $(LDOUT) $<.obj -x $<
@echo building shared object $@
diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
index 79c92bc8a84..bb56830fe5a 100644
--- a/src/makefiles/Makefile.solaris
+++ b/src/makefiles/Makefile.solaris
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.13 2005/12/09 21:19:36 petere Exp $
+# $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.14 2008/09/01 08:50:10 petere Exp $
AROPT = crs
@@ -17,6 +17,10 @@ CFLAGS_SL = -KPIC
endif
%.so: %.o
- $(LD) -G -Bdynamic -o $@ $<
+ifeq ($(GCC), yes)
+ $(CC) $(CFLAGS) -shared -o $@ $<
+else
+ $(CC) $(CFLAGS) -G -o $@ $<
+endif
sqlmansect = 5sql
--
GitLab