diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 4e795e32fe322bbe4afc2d64d3bbd8319f059b36..5bf5b818c1dc128cddb330319cf09f34e6e69ed8 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 ea825a7ca6b54629c148141729a4993b9bd5c596..35d45237f5fc12af7a93181097dffa4d482966fc 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 47b1274055cd3ddb05de3bd1e3e6a36df2bdcf46..0ce070412361e88667048b34b50fc3e3c24addd3 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 f6e57608064e0bfc0c7c165880964ee602f73f95..201dcd6f4cd7703773fb685b4166b70ba7b9afd1 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 2a23c5a8fd4b72232ce15b63d7e9182996e59639..145653860e12eedc251670bc1e2f9582e4bd243f 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 8766d18f6140cdaf76035720164a894ed60027c9..0fadd273104d51222976f35804775823de12a2ca 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 db33ebff78eefba8d8aa3cc4369845261468f1e1..820e33074f17541b74535bfc8153f0cd927861d5 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 24e201836e90db412ae63504d2b996d970736fc3..7c6765c65703552250e6e081439cf4240936da41 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 79c92bc8a84b60d9c0f2073e5efe00c5f45ea23f..bb56830fe5a21f820381eb12ea256671aff01bc2 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