aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViktor Szakats <vszakats@users.noreply.github.com>2015-01-08 18:19:03 +0100
committerViktor Szakats <vszakats@users.noreply.github.com>2015-01-08 18:19:03 +0100
commitacc8089bc20636067d94778b1dec4fb6b81ccffa (patch)
tree6d18bc8d99fdb8dfae4f822e327a335b03ef7816
parent34636fa47e494735a5ec8b5ec7181ce6688f6f12 (diff)
add -m64 clags when targeting mingw64, add -m32/-m64 to LDFLAGS
-rw-r--r--lib/Makefile.m324
-rw-r--r--src/Makefile.m325
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index f3673c5a3..92d59f9b2 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -75,7 +75,7 @@ endif
endif
ifeq ($(ARCH),w64)
-CFLAGS += -D_AMD64_
+CFLAGS += -m64 -D_AMD64_
RCFLAGS += -F pe-x86-64
else
CFLAGS += -m32
@@ -323,5 +323,3 @@ $(PROOT)/include/curl/curlbuild.h:
$(LIBCARES_PATH)/libcares.a:
$(MAKE) -C $(LIBCARES_PATH) -f Makefile.m32
-
-
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index e54175ced..f3f9054f9 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -90,10 +90,12 @@ endif
endif
ifeq ($(ARCH),w64)
-CFLAGS += -D_AMD64_
+CFLAGS += -m64 -D_AMD64_
+LDFLAGS += -m64
RCFLAGS += -F pe-x86-64
else
CFLAGS += -m32
+LDFLAGS += -m32
RCFLAGS += -F pe-i386
endif
@@ -340,4 +342,3 @@ endif
distclean vclean: clean
@$(call DEL, $(curl_PROGRAMS))
-