Skip to content

Commit

Permalink
Merge branch 'openJDK' of https://github.com/mcepl/narwhal
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Baumgart committed Jan 20, 2011
2 parents 9f55d3e + 7ed145f commit 733aef9
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions engines/rhino/bin/narwhal-rhino
Expand Up @@ -24,9 +24,13 @@ BOOTCLASSPATH=$NARWHAL_ENGINE_HOME/jars/js.jar
JAVA_OPTS=""
isOpenJDK=`java -version 2>&1 | grep -i "OpenJDK" | wc -l`

if [ $isOpenJDK -gt 0 ]; then
JAVA_OPTS="-Xbootclasspath:/usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar"
fi
# See http://github.com/tlrobinson/narwhal\
# /issuesearch?state=open&q=openjdk#issue/61/comment/289520
# for further explanation
#
#if [ $isOpenJDK -gt 0 ]; then
# JAVA_OPTS="-Xbootclasspath:/usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar"
#fi

if [ -n "$NARWHAL_CLASSPATH" ]; then
CLASSPATH=$NARWHAL_CLASSPATH:$CLASSPATH
Expand Down

0 comments on commit 733aef9

Please sign in to comment.