Commit d678bd6f authored by Viktor Szakats's avatar Viktor Szakats Committed by Jay Satiro
Browse files

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
parent c2a809cd

lib/Makefile.m32

+1 −1
Original line number Diff line number Diff line
@@ -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

src/Makefile.m32

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,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_EXE) -s

AR	= $(CROSSPREFIX)ar

RC	= $(CROSSPREFIX)windres

RCFLAGS	= --include-dir=$(PROOT)/include -O COFF