summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch2014-06-11 23:50:57 +0000
committerNoah Misch2014-06-11 23:50:57 +0000
commit4d92b158555452ba62ee3caf5c5546fd4a8cba5b (patch)
tree8c3620b1932a8bb444e7c62d3b49f5ef9f61302f
parentbd31794df7dc53719740aa8e2ea1578ea2b87285 (diff)
Have configuration templates augment, not replace, LDFLAGS.
This preserves user-specified LDFLAGS; we already kept user-specified CFLAGS and CPPFLAGS. Given the shortage of complaints and the fact that any problem caused is likely to appear at build time, no back-patch. Dag-Erling Smørgrav and Noah Misch
-rw-r--r--src/template/cygwin2
-rw-r--r--src/template/win322
2 files changed, 2 insertions, 2 deletions
diff --git a/src/template/cygwin b/src/template/cygwin
index e484fe650c..b6ea0ded52 100644
--- a/src/template/cygwin
+++ b/src/template/cygwin
@@ -6,4 +6,4 @@ SRCH_LIB="/usr/local/lib"
# pg_toupper() etc. in both libpq and pgport
# we'd prefer to use --disable-auto-import to match MSVC linking behavior,
# but support for it in Cygwin is too haphazard
-LDFLAGS="-Wl,--allow-multiple-definition -Wl,--enable-auto-import"
+LDFLAGS="$LDFLAGS -Wl,--allow-multiple-definition -Wl,--enable-auto-import"
diff --git a/src/template/win32 b/src/template/win32
index dc5b77ec07..7da9719acb 100644
--- a/src/template/win32
+++ b/src/template/win32
@@ -3,4 +3,4 @@
# --allow-multiple-definition is required to link pg_dump because it finds
# pg_toupper() etc. in both libpq and pgport
# --disable-auto-import is to ensure we get MSVC-like linking behavior
-LDFLAGS="-Wl,--allow-multiple-definition -Wl,--disable-auto-import"
+LDFLAGS="$LDFLAGS -Wl,--allow-multiple-definition -Wl,--disable-auto-import"