summaryrefslogtreecommitdiff
path: root/src/tools/ifaddrs
diff options
context:
space:
mode:
authorTom Lane2010-07-05 18:54:38 +0000
committerTom Lane2010-07-05 18:54:38 +0000
commit291a9577454a63f99b5537e48a3dceae6d35ea8d (patch)
treea842e9bd4b21b681b89516a33fe65b207a21c42d /src/tools/ifaddrs
parenteb81b6509f4c9109ecf8839d8c482cc597270687 (diff)
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.
Diffstat (limited to 'src/tools/ifaddrs')
-rw-r--r--src/tools/ifaddrs/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/ifaddrs/Makefile b/src/tools/ifaddrs/Makefile
index de8cf459b9..72a6aa7de8 100644
--- a/src/tools/ifaddrs/Makefile
+++ b/src/tools/ifaddrs/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 2003-2010, PostgreSQL Global Development Group
#
-# $PostgreSQL: pgsql/src/tools/ifaddrs/Makefile,v 1.2 2010/01/02 16:58:16 momjian Exp $
+# $PostgreSQL: pgsql/src/tools/ifaddrs/Makefile,v 1.3 2010/07/05 18:54:38 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -21,7 +21,7 @@ OBJS = test_ifaddrs.o
all: test_ifaddrs
test_ifaddrs: test_ifaddrs.o $(libpq_backend_dir)/ip.o
- $(CC) $(CFLAGS) test_ifaddrs.o $(libpq_backend_dir)/ip.o $(LDFLAGS) $(LIBS) -o $@$(X)
+ $(CC) $(CFLAGS) test_ifaddrs.o $(libpq_backend_dir)/ip.o $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
clean distclean maintainer-clean:
rm -f test_ifaddrs$(X) $(OBJS)