[Truffle] Fix broken mx.

jruby · Dec 9, 2016 · a97a93f · a97a93f
1 parent 87d63a0
commit a97a93f
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/mx.jruby/mx_jruby.py b/mx.jruby/mx_jruby.py
@@ -107,7 +107,7 @@ def extractArguments(cli_args):
                 rubyArgs.append(arg)
                 rubyArgs.extend(args)
                 break
-    return vmArgs, rubyArgs, classpath, print_command, classic
+    return vmArgs, rubyArgs, classpath, print_command
 
 def setup_jruby_home():
     rubyZip = mx.distribution('RUBY-ZIP').path
@@ -132,7 +132,7 @@ def ruby_command(args):
     java = os.getenv('JAVACMD', java_home + '/bin/java')
     argv0 = java
 
-    vmArgs, rubyArgs, user_classpath, print_command, classic = extractArguments(args)
+    vmArgs, rubyArgs, user_classpath, print_command = extractArguments(args)
     classpath = mx.classpath(['TRUFFLE_API', 'RUBY']).split(':')
     truffle_api, classpath = classpath[0], classpath[1:]
     assert os.path.basename(truffle_api) == "truffle-api.jar"
@@ -144,9 +144,7 @@ def ruby_command(args):
         '-cp', ':'.join(classpath),
         'org.jruby.truffle.Main'
     ]
-    if not classic:
-        vmArgs = vmArgs + ['-X+T']
-    allArgs = vmArgs + rubyArgs
+    allArgs = vmArgs + ['-X+T'] + rubyArgs
 
     env = setup_jruby_home()