add -m64 clags when targeting mingw64, add -m32/-m64 to LDFLAGS

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index f3673c5a3e3d7e8dc12436eaca47cfa22a1fc5ff..92d59f9b26e61815e6cf97375cfc2b48da71246d 100644 (file)
--- 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 e54175cedfb39b9453a6aae1959c1b0b6305c43f..f3f9054f95c92c885928277c5bfea042308ff0c1 100644 (file)
--- 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))
-