File tree Expand file tree Collapse file tree 1 file changed +3
-11
lines changed Expand file tree Collapse file tree 1 file changed +3
-11
lines changed Original file line number Diff line number Diff line change @@ -412,16 +412,8 @@ def python_so(args):
412
412
return _python_graalvm_launcher ((args or []) + ["svm" ])
413
413
414
414
415
- def _build_graalvm_launcher (mx_args ):
416
- mx .logv ("Building GraalVM launcher with %s" % mx_args )
417
- with set_env (LINKY_LAYOUT = "*.jar" ):
418
- mx .run_mx (mx_args + ["build" ])
419
-
420
-
421
415
def _python_graalvm_launcher (args , extra_dy = None ):
422
416
dy = "/vm,/tools"
423
- if extra_dy is None :
424
- extra_dy = "," .join (("/" + dy [0 ]) if dy [1 ] else dy [0 ] for dy in mx .get_dynamic_imports ())
425
417
if extra_dy :
426
418
dy += "," + extra_dy
427
419
if "sandboxed" in args :
@@ -431,11 +423,11 @@ def _python_graalvm_launcher(args, extra_dy=None):
431
423
args .remove ("svm" )
432
424
dy += ",/substratevm"
433
425
dy = ["--dynamicimports" , dy ]
434
- _build_graalvm_launcher (dy )
426
+ mx . run_mx (dy + [ "build" ] )
435
427
out = mx .OutputCapture ()
436
- mx .run_mx (dy + ["graalvm-home" ], out = out )
428
+ mx .run_mx (dy + ["graalvm-home" ], out = mx . TeeOutputCapture ( out ) )
437
429
launcher = os .path .join (out .data .strip (), "bin" , "graalpython" ).split ("\n " )[- 1 ].strip ()
438
- mx .logv (launcher )
430
+ mx .log (launcher )
439
431
if args :
440
432
mx .run ([launcher ] + args )
441
433
return launcher
You can’t perform that action at this time.
0 commit comments