aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Makefile.m329
-rw-r--r--src/Makefile.m329
2 files changed, 14 insertions, 4 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index d0ac77b10..2b23a40ee 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -54,9 +54,14 @@ ifndef LIBCARES_PATH
LIBCARES_PATH = $(PROOT)/ares
endif
-# Edit the var below to set to your architecture or set environment var.
+# Set environment var ARCH to your architecture to override autodetection.
ifndef ARCH
-ARCH = w32
+TARGET := $(shell $(CC) -dumpmachine)
+ifeq ($(findstring x86_64,$(TARGET)),x86_64)
+ARCH = w64
+else
+ARCH = w32
+endif
endif
CC = $(CROSSPREFIX)gcc
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index ac1c0b835..5cacade57 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -66,9 +66,14 @@ ifndef LIBCARES_PATH
LIBCARES_PATH = $(PROOT)/ares
endif
-# Edit the var below to set to your architecture or set environment var.
+# Set environment var ARCH to your architecture to override autodetection.
ifndef ARCH
-ARCH = w32
+TARGET := $(shell $(CC) -dumpmachine)
+ifeq ($(findstring x86_64,$(TARGET)),x86_64)
+ARCH = w64
+else
+ARCH = w32
+endif
endif
CC = $(CROSSPREFIX)gcc