stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7192916: Hotspot development launcher should use DYLD_LIBRARY_PATH on OS X

Browse Source 
Reviewed-by: dholmes, dsamersoff, nloodin
This commit is contained in:
Staffan Larsen 2012-08-22 10:01:51 +02:00
parent 9d85b8e187
commit 6d8fa095b3
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hotspot/src/os/posix/launcher/launcher.script
View File

@ -114,22 +114,34 @@ fi
# any. # any.
JRE=$JDK/jre JRE=$JDK/jre
JAVA_HOME=$JDK JAVA_HOME=$JDK
ARCH=@@LIBARCH@@ export JAVA_HOME
ARCH=@@LIBARCH@@
SBP=${MYDIR}:${JRE}/lib/${ARCH} SBP=${MYDIR}:${JRE}/lib/${ARCH}
# Set up a suitable LD_LIBRARY_PATH
if [ -z "$LD_LIBRARY_PATH" ] # Set up a suitable LD_LIBRARY_PATH or DYLD_LIBRARY_PATH
OS=`uname -s`
if [ "${OS}" = "Darwin" ]
then then
LD_LIBRARY_PATH="$SBP" if [ -z "$DYLD_LIBRARY_PATH" ]
then
DYLD_LIBRARY_PATH="$SBP"
else
DYLD_LIBRARY_PATH="$SBP:$DYLD_LIBRARY_PATH"
fi
export DYLD_LIBRARY_PATH
else else
# not 'Darwin'
if [ -z "$LD_LIBRARY_PATH" ]
then
LD_LIBRARY_PATH="$SBP"
else
LD_LIBRARY_PATH="$SBP:$LD_LIBRARY_PATH" LD_LIBRARY_PATH="$SBP:$LD_LIBRARY_PATH"
fi
export LD_LIBRARY_PATH
fi fi
export LD_LIBRARY_PATH
export JAVA_HOME
JPARMS="$@ $JAVA_ARGS"; JPARMS="$@ $JAVA_ARGS";
# Locate the gamma development launcher # Locate the gamma development launcher