Skip to content

Commit c59fd7b

Browse files
committed
Remove redundant dependencies on Truffle NFI
* The GRAALPYTHON distribution already depends on them.
1 parent 9acaf31 commit c59fd7b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ def do_run_python(args, extra_vm_args=None, env=None, jdk=None, extra_dists=None
356356
cp_prefix = ver_dep if cp_prefix is None else (ver_dep + os.pathsep + cp_prefix)
357357
else:
358358
dists = ['GRAALPYTHON']
359-
dists += ['TRUFFLE_NFI', 'TRUFFLE_NFI_LIBFFI', 'GRAALPYTHON-LAUNCHER']
359+
dists += ['GRAALPYTHON-LAUNCHER']
360360

361361
vm_args, graalpython_args = mx.extract_VM_args(args, useDoubleDash=True, defaultAllVMArgs=False)
362362
if minimal:
@@ -396,7 +396,7 @@ def do_run_python(args, extra_vm_args=None, env=None, jdk=None, extra_dists=None
396396

397397
def node_footprint_analyzer(args, **kwargs):
398398
main_class = 'com.oracle.graal.python.test.advanced.NodeFootprintAnalyzer'
399-
vm_args = mx.get_runtime_jvm_args(['GRAALPYTHON_UNIT_TESTS', 'GRAALPYTHON', 'TRUFFLE_NFI', 'TRUFFLE_NFI_LIBFFI'])
399+
vm_args = mx.get_runtime_jvm_args(['GRAALPYTHON_UNIT_TESTS', 'GRAALPYTHON'])
400400
return mx.run_java(vm_args + [main_class] + args, **kwargs)
401401

402402

@@ -2538,7 +2538,7 @@ def run_leak_launcher(input_args):
25382538

25392539
env = os.environ.copy()
25402540

2541-
dists = ['GRAALPYTHON', 'GRAALPYTHON_RESOURCES', 'TRUFFLE_NFI', 'TRUFFLE_NFI_LIBFFI', 'GRAALPYTHON_UNIT_TESTS']
2541+
dists = ['GRAALPYTHON', 'GRAALPYTHON_RESOURCES', 'GRAALPYTHON_UNIT_TESTS']
25422542

25432543
vm_args, graalpython_args = mx.extract_VM_args(args, useDoubleDash=True, defaultAllVMArgs=False)
25442544
vm_args += mx.get_runtime_jvm_args(dists)

0 commit comments

Comments
 (0)