Skip to content

Commit 4d92b15

Browse files
committed
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
1 parent bd31794 commit 4d92b15

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/template/cygwin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ SRCH_LIB="/usr/local/lib"
66
# pg_toupper() etc. in both libpq and pgport
77
# we'd prefer to use --disable-auto-import to match MSVC linking behavior,
88
# but support for it in Cygwin is too haphazard
9-
LDFLAGS="-Wl,--allow-multiple-definition -Wl,--enable-auto-import"
9+
LDFLAGS="$LDFLAGS -Wl,--allow-multiple-definition -Wl,--enable-auto-import"

src/template/win32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# --allow-multiple-definition is required to link pg_dump because it finds
44
# pg_toupper() etc. in both libpq and pgport
55
# --disable-auto-import is to ensure we get MSVC-like linking behavior
6-
LDFLAGS="-Wl,--allow-multiple-definition -Wl,--disable-auto-import"
6+
LDFLAGS="$LDFLAGS -Wl,--allow-multiple-definition -Wl,--disable-auto-import"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy