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/test/thread/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/test/thread') diff --git a/src/test/thread/Makefile b/src/test/thread/Makefile index fda66bdbfd..b932d10a26 100644 --- a/src/test/thread/Makefile +++ b/src/test/thread/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 2003-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/test/thread/Makefile,v 1.6 2010/01/02 16:58:16 momjian Exp $ +# $PostgreSQL: pgsql/src/test/thread/Makefile,v 1.7 2010/07/05 18:54:38 tgl Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ all: thread_test thread_test: thread_test.o # no need for $LIBS, might not be compiled yet - $(CC) $(CFLAGS) $(LDFLAGS) $^ $(PTHREAD_LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $^ $(PTHREAD_LIBS) -o $@ clean distclean maintainer-clean: rm -f thread_test$(X) thread_test.o -- cgit v1.2.1