[Truffle] Assume that Graal is automatically set up if RUBY_BIN is set.

jruby · Sep 28, 2016 · c0f8c56 · c0f8c56
1 parent dc0f782
commit c0f8c56
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -574,9 +574,14 @@ def run(*args)
     end
 
     if args.delete('--graal')
-      javacmd, javacmd_options = Utilities.find_graal_javacmd_and_options
-      env_vars["JAVACMD"] = javacmd
-      jruby_args.push(*javacmd_options)
+      if ENV["RUBY_BIN"]
+        # Assume that Graal is automatically set up if RUBY_BIN is set.
+        # This will also warn if it's not.
+      else
+        javacmd, javacmd_options = Utilities.find_graal_javacmd_and_options
+        env_vars["JAVACMD"] = javacmd
+        jruby_args.push(*javacmd_options)
+      end
     else
       jruby_args << '-Xtruffle.graal.warn_unless=false'
     end