From bc284d97175add461d17a8a3c90419f4171f29a2 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Tue, 5 Jan 2010 12:29:08 +0000 Subject: [PATCH] Makefile bug on Mac OS X 64-bit (not copied from 3.3 ( .1 ) fixes ) . git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1668 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/prism/Makefile b/prism/Makefile index aa7e64ac..18ed3dfa 100644 --- a/prism/Makefile +++ b/prism/Makefile @@ -67,7 +67,8 @@ ifneq (,$(findstring ia64, $(shell uname -m))) ARCH = ia64 endif ifeq ($(OSTYPE),darwin) - ifneq (,$(findstring 64-bit, $(shell java -version 2>&1))) + JAVA_VERSION_STRING = $(shell java -version 2>&1) + ifneq (, $(or $(findstring 64-bit, $(JAVA_VERSION_STRING)), $(findstring 64-Bit, $(JAVA_VERSION_STRING)) )) ARCH = x86_64 endif endif