From cd4e8cba19519eee26bb9b4169d60a66bd28b2fc Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Thu, 5 May 2016 07:44:18 +0000 Subject: [PATCH] Fix for Mac launch scripts - find right Java executable to avoid DYLD_LIBRARY_PATH problems. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11329 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/bin/prism.darwin32 | 8 +++++++- prism/src/bin/prism.darwin64 | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/prism/src/bin/prism.darwin32 b/prism/src/bin/prism.darwin32 index 8c12b698..7587a560 100755 --- a/prism/src/bin/prism.darwin32 +++ b/prism/src/bin/prism.darwin32 @@ -15,7 +15,13 @@ fi; # Command to launch Java if [ "$PRISM_JAVA" = "" ]; then - PRISM_JAVA=java + # On OS X, we want to avoiding calling java from the /usr/bin link + # since it causes problems with dynamic linking (DYLD_LIBRARY_PATH) + if [ -x /usr/libexec/java_home ]; then + PRISM_JAVA=`/usr/libexec/java_home`"/bin/java" + else + PRISM_JAVA=java + fi fi # If there is a -javamaxmem switch, use it for PRISM_JAVAMAXMEM diff --git a/prism/src/bin/prism.darwin64 b/prism/src/bin/prism.darwin64 index 4bd8b3f0..1ea95455 100755 --- a/prism/src/bin/prism.darwin64 +++ b/prism/src/bin/prism.darwin64 @@ -15,7 +15,13 @@ fi; # Command to launch Java if [ "$PRISM_JAVA" = "" ]; then - PRISM_JAVA=java + # On OS X, we want to avoiding calling java from the /usr/bin link + # since it causes problems with dynamic linking (DYLD_LIBRARY_PATH) + if [ -x /usr/libexec/java_home ]; then + PRISM_JAVA=`/usr/libexec/java_home`"/bin/java" + else + PRISM_JAVA=java + fi fi # If there is a -javamaxmem switch, use it for PRISM_JAVAMAXMEM