aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorViktor Szakats <vszakats@users.noreply.github.com>2016-03-01 20:50:13 +0100
committerJay Satiro <raysatiro@yahoo.com>2016-03-01 17:46:16 -0500
commitd678bd6f60219ad95f709587ddfee2d4943abba1 (patch)
treecaf74e727aec8e73a0d6d71d6cf50b36e705f606 /lib
parentc2a809cd265c37e7bbef55e64d70114d2f0d7189 (diff)
makefile.m32: allow to pass .dll/.exe-specific LDFLAGS
using envvars `CURL_LDFLAG_EXTRAS_DLL` and `CURL_LDFLAG_EXTRAS_EXE` respectively. This is useful f.e. to pass ASLR-related extra options, that are required to make this feature work when using the mingw toolchain. Ref: https://github.com/curl/curl/pull/670#issuecomment-190863985 Closes https://github.com/curl/curl/pull/689
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.m322
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index fbc38de21..eeb4311ba 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -80,7 +80,7 @@ CC = $(CROSSPREFIX)gcc
CFLAGS = $(CURL_CFLAG_EXTRAS) -g -O2 -Wall
CFLAGS += -fno-strict-aliasing
# comment LDFLAGS below to keep debug info
-LDFLAGS = $(CURL_LDFLAG_EXTRAS) -s
+LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_DLL) -s
AR = $(CROSSPREFIX)ar
RANLIB = $(CROSSPREFIX)ranlib
RC = $(CROSSPREFIX)windres