Skip to content

Commit 2157133

Browse files
committed
Look first in ~/.mx/env for $JAVA_HOME
* See https://github.com/graalvm/mx#environment-variable-processing
1 parent c65871f commit 2157133

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

tool/jt.rb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,14 @@ def chdir(dir, &block)
488488

489489
def find_java_home
490490
@java_home ||= begin
491-
java_home = ENV['JAVA_HOME']
491+
mx_env = File.expand_path('~/.mx/env')
492+
if File.readable?(mx_env)
493+
if line = File.readlines(mx_env).grep(/^JAVA_HOME=/).first
494+
java_home = line.split('=', 2).last
495+
end
496+
end
497+
java_home ||= ENV['JAVA_HOME']
498+
492499
_, jvmci_version = jvmci_update_and_version
493500
if java_home
494501
if java_home.include?(jvmci_version)

0 commit comments

Comments
 (0)