From 51444118d8cfd58e3cf57018cbefdddd7bc03a4a Mon Sep 17 00:00:00 2001 From: Martin Nowak Date: Sun, 22 Dec 2013 03:36:46 +0100 Subject: [PATCH] detect other uname -m outputs - x86_64, amd64 => MODEL:=64 - i386, i586, i686 => MODEL:32 --- posix.mak | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/posix.mak b/posix.mak index 3a9066a2c4f..c917694b5f8 100644 --- a/posix.mak +++ b/posix.mak @@ -32,18 +32,14 @@ endif ifeq (,$(MODEL)) uname_M:=$(shell uname -m) - ifeq (x86_64,$(uname_M)) - MODEL=64 - else - ifeq (i686,$(uname_M)) - MODEL=32 - else - ifeq (i386,$(uname_M)) - MODEL=32 - else - $(error Cannot figure 32/64 model from uname -m: $(uname_M)) - endif - endif + ifneq (,$(findstring $(uname_M),x86_64 amd64)) + MODEL:=64 + endif + ifneq (,$(findstring $(uname_M),i386 i586 i686)) + MODEL:=32 + endif + ifeq (,$(MODEL)) + $(error Cannot figure 32/64 model from uname -m: $(uname_M)) endif endif