Skip to content

Commit

Permalink
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions bin/jruby.bash
Original file line number Diff line number Diff line change
@@ -302,8 +302,8 @@ do
# Start up as Nailgun server
java_class=$JAVA_CLASS_NGSERVER
VERIFY_JRUBY=true ;;
--jvmci-truffle)
JVMCI_TRUFFLE=true ;;
--no-bootclasspath)
NO_BOOTCLASSPATH=true ;;
--ng)
# Use native Nailgun client to toss commands to server
process_special_opts "--ng" ;;
@@ -370,7 +370,7 @@ if [ "$nailgun_client" != "" ]; then
exit 1
fi
else
if [[ "$JVMCI_TRUFFLE" != "" || ("$VERIFY_JRUBY" != "" && -z "$USING_TRUFFLE") ]]; then
if [[ "$NO_BOOTCLASSPATH" != "" || ("$VERIFY_JRUBY" != "" && -z "$USING_TRUFFLE") ]]; then
if [ "$PROFILE_ARGS" != "" ]; then
echo "Running with instrumented profiler"
fi
4 changes: 3 additions & 1 deletion bin/jruby.sh
Original file line number Diff line number Diff line change
@@ -247,6 +247,8 @@ do
# Start up as Nailgun server
java_class=$JAVA_CLASS_NGSERVER
VERIFY_JRUBY=true ;;
--no-bootclasspath)
NO_BOOTCLASSPATH=true ;;
--ng)
# Use native Nailgun client to toss commands to server
process_special_opts "--ng" ;;
@@ -284,7 +286,7 @@ if [ "$nailgun_client" != "" ]; then
exit 1
fi
else
if [ "$VERIFY_JRUBY" != "" ]; then
if [ "$NO_BOOTCLASSPATH" != "" || "$VERIFY_JRUBY" != "" ]; then
if [ "$PROFILE_ARGS" != "" ]; then
echo "Running with instrumented profiler"
fi
2 changes: 1 addition & 1 deletion tool/jt.rb
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ def self.find_graal_javacmd_and_options
'--add-exports=java.base/jdk.internal.module=com.oracle.graal.graal_core',
"--module-path=#{jvmci_graal_home}/../truffle/mxbuild/modules/com.oracle.truffle.truffle_api.jar:#{jvmci_graal_home}/mxbuild/modules/com.oracle.graal.graal_core.jar"
]
options = ['--jvmci-truffle']
options = ['--no-bootclasspath']
elsif graal_home
graal_home = File.expand_path(graal_home)
command_line = `mx -v -p #{graal_home} vm -version`.lines.to_a.last

0 comments on commit fbc7231

Please sign in to comment.