From 4d92b158555452ba62ee3caf5c5546fd4a8cba5b Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Wed, 11 Jun 2014 19:50:57 -0400 Subject: [PATCH] Have configuration templates augment, not replace, LDFLAGS. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- src/template/cygwin | 2 +- src/template/win32 | 2 +- 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" -- 2.50.1