Merge pull request #3686 from jasonbking/issue_12962

Fix issue 12962 - use isainfo on Solaris to determine model
dlang · Jun 23, 2014 · dd45b50 · dd45b50
2 parents 514db2e + 6c5c5a9
commit dd45b50
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/osmodel.mak b/src/osmodel.mak
@@ -32,7 +32,11 @@ ifeq (MACOS,$(OS))
 endif
 
 ifeq (,$(MODEL))
-  uname_M:=$(shell uname -m)
+  ifeq ($(OS), solaris)
+    uname_M:=$(shell isainfo -n)
+  else
+    uname_M:=$(shell uname -m)
+  endif
   ifneq (,$(findstring $(uname_M),x86_64 amd64))
     MODEL:=64
   endif