Skip to content

Commit 052fb9a

Browse files
committed
Do not require nfi when creating frozen modules
1 parent 63946ab commit 052fb9a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2322,16 +2322,17 @@ def run(self, args, env=None, cwd=None, **kwargs):
23222322
args.insert(0, "-q")
23232323

23242324
args[:0] = [
2325-
f"--python.PyCachePrefix={pycache_dir}",
2326-
"--python.DisableFrozenModules",
2325+
"--PosixModuleBackend=java",
2326+
"--CompressionModulesBackend=java",
2327+
f"--PyCachePrefix={pycache_dir}",
2328+
"--DisableFrozenModules",
23272329
"-B",
23282330
"-S"
23292331
]
23302332
mx_util.ensure_dir_exists(cwd)
23312333

23322334
env = env.copy() if env else os.environ.copy()
23332335
env.update(cast(GraalpythonProject, self.subject).getBuildEnv())
2334-
args.insert(0, '--PosixModuleBackend=java')
23352336
jdk = mx.get_jdk() # Don't get JVMCI, it might not have finished building by this point
23362337
rc = do_run_python(args, jdk=jdk, env=env, cwd=cwd, minimal=True, out=self.PrefixingOutput(self.subject.name, mx.log), err=self.PrefixingOutput(self.subject.name, mx.log_error), **kwargs)
23372338

mx.graalpython/suite.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@
333333
"com.oracle.graal.python",
334334
"GRAALPYTHON-LAUNCHER",
335335
"regex:TREGEX",
336-
"truffle:TRUFFLE_NFI_LIBFFI",
337336
],
338337
},
339338

0 commit comments

Comments
 (0)