aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Knauf <lists@gknw.net>2014-12-01 16:37:19 +0100
committerGuenter Knauf <lists@gknw.net>2014-12-01 16:39:56 +0100
commit228f1ee9f2e5eb16adca86a3d4f5062d5cfabcf3 (patch)
treeacf589ff99c4750dfcf68de1253432ce82994562
parentcf6c5c222d86088cbfc9dee4c23f8ada96ee91e7 (diff)
build: in Makefile.m32 simplified autodetection.
-rw-r--r--lib/Makefile.m323
-rw-r--r--src/Makefile.m323
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index de44c66ea..f6ef0a30f 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -67,8 +67,7 @@ STRIP = $(CROSSPREFIX)strip -g
# Set environment var ARCH to your architecture to override autodetection.
ifndef ARCH
-TARGET := $(shell $(CC) -dumpmachine)
-ifeq ($(findstring x86_64,$(TARGET)),x86_64)
+ifeq ($(findstring x86_64,$(shell $(CC) -dumpmachine)),x86_64)
ARCH = w64
else
ARCH = w32
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 4f1c99bdd..22269298c 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -82,8 +82,7 @@ STRIP = $(CROSSPREFIX)strip -g
# Set environment var ARCH to your architecture to override autodetection.
ifndef ARCH
-TARGET := $(shell $(CC) -dumpmachine)
-ifeq ($(findstring x86_64,$(TARGET)),x86_64)
+ifeq ($(findstring x86_64,$(shell $(CC) -dumpmachine)),x86_64)
ARCH = w64
else
ARCH = w32