Split the LDFLAGS make variable into two parts: LDFLAGS is now used for

linking both executables and shared libraries, and we add on LDFLAGS_EX when
linking executables or LDFLAGS_SL when linking shared libraries.  This
provides a significantly cleaner way of dealing with link-time switches than
the former behavior.  Also, make sure that the various platform-specific
%.so: %.o rules incorporate LDFLAGS and LDFLAGS_SL; most of them missed that
before.  (I did not add these variables for the platforms that invoke $(LD)
directly, however.  It's not clear if we can do that safely, since for the
most part we assume these variables use CC command-line syntax.)

Per gripe from Aaron Swenson and subsequent investigation.

1 files changed, 4 insertions, 7 deletions

diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
index debad62e8a..2f6743ab14 100644
--- a/src/makefiles/Makefile.darwin
+++ b/src/makefiles/Makefile.darwin
@@ -1,16 +1,13 @@
 AROPT = crs
-AWK= awk
  
 DLSUFFIX = .so
-CFLAGS_SL =
 
 ifdef PGXS
-BE_DLLLIBS= -bundle_loader $(bindir)/postgres
+  BE_DLLLIBS = -bundle_loader $(bindir)/postgres
 else
-BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
+  BE_DLLLIBS = -bundle_loader $(top_builddir)/src/backend/postgres
 endif
 
-# Rule for building shared libs (currently used only for regression test
-# shlib ... should go away, since this is not really enough knowledge)
+# Rule for building a shared library from a single .o file
 %.so: %.o
-	$(CC) $(CFLAGS) -bundle -o $@ $< $(BE_DLLLIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -bundle -o $@ $< $(BE_DLLLIBS)