From 291a9577454a63f99b5537e48a3dceae6d35ea8d Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Mon, 5 Jul 2010 18:54:38 +0000
Subject: 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.
---
 src/timezone/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/timezone')

diff --git a/src/timezone/Makefile b/src/timezone/Makefile
index fda2fa703a6..ddf07ad3daa 100644
--- a/src/timezone/Makefile
+++ b/src/timezone/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for the timezone library
 
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/timezone/Makefile,v 1.32 2009/08/26 22:24:43 petere Exp $
+#    $PostgreSQL: pgsql/src/timezone/Makefile,v 1.33 2010/07/05 18:54:38 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -47,7 +47,7 @@ ZIC= ./zic
 endif
 
 zic: $(ZICOBJS)
-	$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
+	$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
 
 install: all installdirs
 ifeq (,$(with_system_tzdata))
-- 
cgit v1.2.3