diff options
| author | Guenter Knauf <lists@gknw.net> | 2014-11-19 11:38:37 +0100 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2014-11-19 11:40:04 +0100 |
| commit | a08decdfed2e83001c47b1eb771b79756d2bab4c (patch) | |
| tree | 829c0b4b1916c2cdb5384c95579ca175af02f027 | |
| parent | fba9f41b84cc591f124cef7d796321cfa000fc8c (diff) | |
build: in Makefile.m32 try to detect 64bit target.
| -rw-r--r-- | lib/Makefile.m32 | 9 | ||||
| -rw-r--r-- | src/Makefile.m32 | 9 |
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 |