From 51376b7dc8758a4c97bd90ff2599cdb586961869 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Wed, 27 May 2009 15:26:10 +0000 Subject: [PATCH] Attempted detection of 64-bit (Java) on Macs. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1105 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/prism/Makefile b/prism/Makefile index 22d6514b..f5edb52a 100644 --- a/prism/Makefile +++ b/prism/Makefile @@ -66,6 +66,11 @@ endif ifneq (,$(findstring ia64, $(shell uname -m))) ARCH = ia64 endif +ifeq ($(OSTYPE),darwin) + ifneq (,$(findstring 64-bit, $(shell java -version 2>&1))) + ARCH = x86_64 + endif +endif ######## # Java # @@ -510,7 +515,7 @@ checks: echo "You may need to set JAVA_DIR by hand. See the PRISM manual for details."; \ exit 1; \ fi; \ - echo "OSTYPE: $(OSTYPE) $(ARCH)"; \ + echo "OSTYPE/ARCH: $(OSTYPE) $(ARCH)"; \ echo "JAVA_DIR: $(JAVA_DIR)"; \ echo "JAVAC: "`which $(JAVAC)` \ )