[Truffle] Don't add the Truffle jar to the classpath unless -X+T is u…

…sed.
jruby · Jan 11, 2016 · e84c5e6 · e84c5e6
1 parent 1a608fc
commit e84c5e6
Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/bin/jruby.bash b/bin/jruby.bash
@@ -146,12 +146,6 @@ for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.jar; do
     JRUBY_ALREADY_ADDED=true
 done
 
-# The Truffle jar always needs to be on the boot classpath, if it exists, so
-# that the VM can substitute classes.
-if [ -e "$JRUBY_HOME/lib/jruby-truffle.jar" ]; then
-  JRUBY_CP="$JRUBY_CP$CP_DELIMITER$JRUBY_HOME/lib/jruby-truffle.jar"
-fi
-
 if $cygwin; then
     JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`
 fi
@@ -167,6 +161,9 @@ else
         if [ "$j" == "$JRUBY_HOME"/lib/jruby.jar ]; then
           continue
         fi
+        if [ "$j" == "$JRUBY_HOME"/lib/jruby-truffle.jar ]; then
+          continue
+        fi
         if [ "$j" == "$JRUBY_HOME"/lib/jruby-complete.jar ]; then
           continue
         fi
@@ -257,6 +254,10 @@ do
      -X*\.\.\.|-X*\?)
         ruby_args=("${ruby_args[@]}" "$1") ;;
      # Match -Xa.b.c=d to translate to -Da.b.c=d as a java option
+     -X+T)
+        JRUBY_CP="$JRUBY_CP$CP_DELIMITER$JRUBY_HOME/lib/jruby-truffle.jar"
+        ruby_args=("${ruby_args[@]}" "-X+T")
+        ;;
      -X*)
         val=${1:2}
         if expr "$val" : '.*[.]' > /dev/null; then
@@ -411,6 +412,12 @@ else
 
     exit $JRUBY_STATUS
   else
+    echo exec "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
+      "-Djruby.home=$JRUBY_HOME" \
+      "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
+      "-Djruby.shell=$JRUBY_SHELL" \
+      $java_class $mode "$@"
+
     exec "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
       "-Djruby.home=$JRUBY_HOME" \
       "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \

diff --git a/bin/jruby.sh b/bin/jruby.sh
@@ -107,12 +107,6 @@ for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.jar; do
     JRUBY_ALREADY_ADDED=true
 done
 
-# The Truffle jar always needs to be on the boot classpath, if it exists, so
-# that the VM can substitute classes.
-if [ -e "$JRUBY_HOME/lib/jruby-truffle.jar" ]; then
-  JRUBY_CP="$JRUBY_CP$CP_DELIMITER$JRUBY_HOME/lib/jruby-truffle.jar"
-fi
-
 # ----- Set Up The System Classpath -------------------------------------------
 
 if [ "$JRUBY_PARENT_CLASSPATH" != "" ]; then
@@ -124,6 +118,9 @@ else
         if [ "$j" == "$JRUBY_HOME"/lib/jruby.jar ]; then
           continue
         fi
+        if [ "$j" == "$JRUBY_HOME"/lib/jruby-truffle.jar ]; then
+          continue
+        fi
         if [ "$j" == "$JRUBY_HOME"/lib/jruby-complete.jar ]; then
           continue
         fi
@@ -200,6 +197,10 @@ do
      -X*\.\.\.|-X*\?)
         ruby_args="${ruby_args} $1" ;;
      # Match -Xa.b.c=d to translate to -Da.b.c=d as a java option
+     -X+T)
+      JRUBY_CP="$JRUBY_CP$CP_DELIMITER$JRUBY_HOME/lib/jruby-truffle.jar"
+      ruby_args="${ruby_args} -X+T"
+      ;;
      -X*)
      val=${1:2}
      if expr "$val" : '.*[.]' > /dev/null; then