Skip to content

Commit c5c52c5

Browse files
committed
set library path as a normal polyglot option, so it is checked after experimental options
1 parent 040e9ea commit c5c52c5

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,11 @@ def do_run_python(args, extra_vm_args=None, env=None, jdk=None, **kwargs):
123123
dists.append('SULONG')
124124
if mx.suite("sulong-managed", fatalIfMissing=False):
125125
dists.append('SULONG_MANAGED')
126-
vm_args.append(mx_subst.path_substitutions.substitute('-Dpolyglot.llvm.libraryPath=<path:SULONG_MANAGED_LIBS>'))
126+
graalpython_args.insert(0, mx_subst.path_substitutions.substitute('--llvm.libraryPath=<path:SULONG_MANAGED_LIBS>'))
127127
else:
128-
vm_args.append(mx_subst.path_substitutions.substitute('-Dpolyglot.llvm.libraryPath=<path:SULONG_LIBS>'))
128+
graalpython_args.insert(0, mx_subst.path_substitutions.substitute('--llvm.libraryPath=<path:SULONG_LIBS>'))
129+
130+
graalpython_args.insert(0, '--experimental-options=true')
129131

130132
# Try eagerly to include tools on Tim's computer
131133
if not mx.suite("/tools", fatalIfMissing=False):

0 commit comments

Comments
 (0)