Skip to content

Commit

Permalink
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -351,6 +351,7 @@ def help
puts ' JVMCI_DIR_...git_branch_name... JMVCI repository to use for a given branch'
puts ' GRAAL_JS_JAR The location of trufflejs.jar'
puts ' SULONG_DIR The location of a built checkout of the Sulong repository'
puts ' SULONG_CLASSPATH An explicit classpath to use for Sulong, rather than working it out from SULONG_DIR'
end

def checkout(branch)
@@ -413,11 +414,16 @@ def run(*args)
if args.delete('--sulong')
dir = Utilities.find_sulong_dir
env_vars["JAVACMD"] = Utilities.find_sulong_graal(dir)
jruby_args << '-J-classpath' << "#{dir}/lib/*"
jruby_args << '-J-classpath' << "#{dir}/build/sulong.jar"
nfi_classes = File.expand_path('../graal-core/mxbuild/graal/com.oracle.nfi/bin', dir)
jruby_args << '-J-classpath' << nfi_classes
jruby_args << '-J-XX:-UseJVMCIClassLoader'

if ENV["SULONG_CLASSPATH"]
jruby_args << '-J-classpath' << ENV["SULONG_CLASSPATH"]
else
jruby_args << '-J-classpath' << "#{dir}/lib/*"
jruby_args << '-J-classpath' << "#{dir}/build/sulong.jar"
nfi_classes = File.expand_path('../graal-core/mxbuild/graal/com.oracle.nfi/bin', dir)
jruby_args << '-J-classpath' << nfi_classes
jruby_args << '-J-XX:-UseJVMCIClassLoader'
end
end

if args.delete('--asm')

0 comments on commit 27b3e8f

Please sign in to comment.