diff options
| author | Noah Misch <noah@leadboat.com> | 2014-06-11 19:50:57 -0400 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2014-06-11 19:50:57 -0400 |
| commit | 4d92b158555452ba62ee3caf5c5546fd4a8cba5b (patch) | |
| tree | 8c3620b1932a8bb444e7c62d3b49f5ef9f61302f | |
| parent | bd31794df7dc53719740aa8e2ea1578ea2b87285 (diff) | |
| download | postgresql-4d92b158555452ba62ee3caf5c5546fd4a8cba5b.tar.gz postgresql-4d92b158555452ba62ee3caf5c5546fd4a8cba5b.zip | |
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/cygwin | 2 | ||||
| -rw-r--r-- | src/template/win32 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/template/cygwin b/src/template/cygwin index e484fe650c6..b6ea0ded522 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 dc5b77ec076..7da9719acbd 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" |