Skip to content

Commit 3e6908c

Browse files
committed
[GR-18163] JT: Add env var JT_ENV to give a default for 'jt build --env JT_ENV' and for 'jt --use JT_ENV'
PullRequest: truffleruby/2660
2 parents cdfb356 + c77417c commit 3e6908c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tool/jt.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def find_mx
192192
def ruby_launcher
193193
return @ruby_launcher if defined? @ruby_launcher
194194

195-
@ruby_name ||= ENV['RUBY_BIN'] || 'jvm'
195+
@ruby_name ||= ENV['RUBY_BIN'] || ENV['JT_ENV'] || 'jvm'
196196
ruby_launcher = if @ruby_name == 'ruby'
197197
ENV['RBENV_ROOT'] ? `rbenv which ruby`.chomp : which('ruby')
198198
elsif @ruby_name.start_with?('/')
@@ -749,7 +749,8 @@ def help
749749
OPENSSL_PREFIX Where to find OpenSSL headers and libraries
750750
ECLIPSE_EXE Where to find Eclipse
751751
SYSTEM_RUBY The Ruby interpreter to run 'jt' itself, when using 'bin/jt'
752-
JT_JDK The JDK version to use: 8, 11 (default) or 16
752+
JT_JDK The default JDK version to use: 8, 11 (default) or 16
753+
JT_ENV The default value for 'jt build --env JT_ENV' and for 'jt --use JT_ENV'
753754
JT_PROFILE_SUBCOMMANDS Print the time each subprocess takes on stderr
754755
TXT
755756
end
@@ -2149,7 +2150,7 @@ def bootstrap_toolchain
21492150
options.delete_at i
21502151
options.delete_at i
21512152
else
2152-
'jvm'
2153+
ENV['JT_ENV'] || 'jvm'
21532154
end
21542155
@mx_env = env
21552156
raise 'Cannot use both --use and --env' if defined?(@ruby_name)

0 commit comments

Comments
 (0)