summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorViktor Szakats <vszakats@users.noreply.github.com>2016-02-20 20:21:48 +0100
committerJay Satiro <raysatiro@yahoo.com>2016-02-20 15:45:39 -0500
commit91cfcc5d6f305fea08674cf39c5882fff2ae2f12 (patch)
tree3e93b9be34e6f81ad25dc8e76c3b6630bbdda718 /src
parente50674ad28272b51acaabc194f425066ea6b0910 (diff)
downloadcurl-91cfcc5d6f305fea08674cf39c5882fff2ae2f12.tar.gz
src/Makefile.m32: add CURL_{LD,C}FLAGS_EXTRAS support
Sync with lib/Makefile.m32 which already uses those variables. Bug: https://github.com/curl/curl/pull/670
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.m3216
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 44925f551..64c65a6f1 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -26,7 +26,7 @@
## and optionally OpenSSL (1.0.2a), libssh2 (1.5), zlib (1.2.8), librtmp (2.4)
##
## Usage: mingw32-make -f Makefile.m32 CFG=-feature1[-feature2][-feature3][...]
-## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-spi-winidn
+## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-sspi-winidn
##
## Hint: you can also set environment vars to control the build, f.e.:
## set ZLIB_PATH=c:/zlib-1.2.8
@@ -89,14 +89,14 @@ LIBCARES_PATH = $(PROOT)/ares
endif
CC = $(CROSSPREFIX)gcc
-CFLAGS = -g -O2 -Wall
+CFLAGS = $(CURL_CFLAG_EXTRAS) -g -O2 -Wall
CFLAGS += -fno-strict-aliasing
# comment LDFLAGS below to keep debug info
-LDFLAGS = -s
+LDFLAGS = $(CURL_LDFLAG_EXTRAS) -s
AR = $(CROSSPREFIX)ar
RC = $(CROSSPREFIX)windres
RCFLAGS = --include-dir=$(PROOT)/include -O COFF
-STRIP = $(CROSSPREFIX)strip -g
+STRIP = $(CROSSPREFIX)strip -g
# We may need these someday
# PERL = perl
@@ -105,18 +105,18 @@ STRIP = $(CROSSPREFIX)strip -g
# Set environment var ARCH to your architecture to override autodetection.
ifndef ARCH
ifeq ($(findstring x86_64,$(shell $(CC) -dumpmachine)),x86_64)
-ARCH = w64
+ARCH = w64
else
-ARCH = w32
+ARCH = w32
endif
endif
ifeq ($(ARCH),w64)
-CFLAGS += -m64 -D_AMD64_
+CFLAGS += -m64 -D_AMD64_
LDFLAGS += -m64
RCFLAGS += -F pe-x86-64
else
-CFLAGS += -m32
+CFLAGS += -m32
LDFLAGS += -m32
RCFLAGS += -F pe-i386
endif