From 9121e29070314cd22bd146f40041af366e47f6f5 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Wed, 10 Nov 2010 21:59:31 +0000 Subject: [PATCH] Bug fix: 64-bit Mac detection in Makefile. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2228 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/prism/Makefile b/prism/Makefile index e25408ae..47298021 100644 --- a/prism/Makefile +++ b/prism/Makefile @@ -69,10 +69,13 @@ endif # For Macs, we decide whether to build in 64-bit mode based on # whether java is 32/64-bit (since these need to match) ifeq ($(OSTYPE),darwin) - 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 + JAVA_VERSION_STRING = $(shell java -version 2>&1) + ifneq (, $(findstring 64-bit, $(JAVA_VERSION_STRING)) ) + ARCH = x86_64 + endif + ifneq (, $(findstring 64-Bit, $(JAVA_VERSION_STRING)) ) + ARCH = x86_64 + endif endif ########