Merge pull request #1904 from MartinNowak/detectMODEL

also detect amd64, i386 and 1586
dlang · Feb 3, 2014 · 7631508 · 7631508
2 parents 44547e3 + 07ce729
commit 7631508
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/posix.mak b/posix.mak
@@ -54,14 +54,14 @@ endif
 
 ifeq (,$(MODEL))
     uname_M:=$(shell uname -m)
-    ifeq (x86_64,$(uname_M))
-        MODEL=64
-    else
-        ifeq (i686,$(uname_M))
-            MODEL=32
-        else
-            $(error Cannot figure 32/64 model from uname -m: $(uname_M))
-        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