[Truffle] JT: Move the check earlier, only user-supplied options are …

…conflicting. * Defaults are tried later, if no user env var is supplied.
jruby · Jun 29, 2016 · 50a06cc · 50a06cc
1 parent 020c2d0
commit 50a06cc
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -48,14 +48,17 @@ def self.truffle_release?
   def self.find_graal_javacmd_and_options
     graalvm = ENV['GRAALVM_BIN']
     graal_home = ENV['GRAAL_HOME']
-    if truffle_release?
-      graalvm ||= ENV['GRAALVM_RELEASE_BIN']
-    else
-      graal_home ||= ENV['GRAAL_HOME_TRUFFLE_HEAD']
-    end
 
     raise "Both GRAALVM_BIN and GRAAL_HOME defined!" if graalvm && graal_home
 
+    if !graalvm && !graal_home
+      if truffle_release?
+        graalvm = ENV['GRAALVM_RELEASE_BIN']
+      else
+        graal_home = ENV['GRAAL_HOME_TRUFFLE_HEAD']
+      end
+    end
+
     if graalvm
       javacmd = File.expand_path(graalvm)
       options = []