Fix jt build —no-sforceimports

PullRequest: truffleruby/688

Author: chrisseaton

mx.truffleruby/mx_truffleruby.py

@@ -58,7 +58,7 @@ def jt(*args):
 
 def build_truffleruby(args = []):
     mx.command_function('sversions')([])
-    jt("build")
+    jt('build', '--no-sforceimports')
 
 def ruby_deploy_binaries(args):
     """Deploy a binary suite for truffleruby"""

tool/jt.rb

@@ -517,9 +517,10 @@ def help
           graalvm [--graal] [--native]               build a minimal JVM-only GraalVM containing only TruffleRuby
               --graal     include graal compiler in the build
               --native    build native ruby image as well
-          native [--no-sulong] [--no-jvmci] [--no-sforceimports] [--no-tools] [extra mx image options]
+          native [--no-sulong] [--no-jvmci] [--no-tools] [extra mx image options]
                                                      build a native image of TruffleRuby (--no-jvmci to use the system Java)
                                                      (--no-tools to exclude chromeinspector and profiler)
+          --no-sforceimports
       jt build_stats [--json] <attribute>            prints attribute's value from build process (e.g., binary size)
       jt clean                                       clean
       jt env                                         prints the current environment
@@ -1880,7 +1881,9 @@ def install_graal(*options)
   end
 
   def build_graalvm(*options)
-    mx('-p', TRUFFLERUBY_DIR, 'sforceimports') unless ci?
+    sforceimports = !options.delete("--no-sforceimports")
+    mx('-p', TRUFFLERUBY_DIR, 'sforceimports') if !ci? && sforceimports
+
     graal = options.delete('--graal')
     native = options.delete('--native')