Skip to content

Commit a4ba079

Browse files
committed
No need for -H:-CopyLanguageResources since there are no resource jars passed to native image anyway
* Remove check, it works fine to build GRAALPY_NATIVE_STANDALONE with a boostrap GraalVM 21.
1 parent 56ea39a commit a4ba079

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,6 @@ def graalpy_standalone_home(standalone_type, enterprise=False, dev=False, build=
646646
else:
647647
env_file = 'native-ee' if enterprise else 'native-ce'
648648
standalone_dist = 'GRAALPY_NATIVE_STANDALONE'
649-
if "GraalVM" in subprocess.check_output([get_jdk().java, '-version'], stderr=subprocess.STDOUT, universal_newlines=True):
650-
assert False, "Cannot build a GraalPy native standalone with a Graal JDK, we only support latest for building the native images"
651649

652650
mx_args = ['-p', SUITE.dir, *(['--env', env_file] if env_file else [])]
653651
mx_args.append("--extra-image-builder-argument=-g")

mx.graalpython/suite.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,6 @@
838838
"-Dorg.graalvm.launcher.class=com.oracle.graal.python.shell.GraalPythonMain",
839839
# GraalPy standalone specific flags
840840
"-J-Xms14g", # GR-46399: libpythonvm needs more than the default minimum of 8 GB to be built
841-
"-H:-CopyLanguageResources",
842841
"-Dpolyglot.python.PosixModuleBackend=native",
843842
"-Dpolyglot.python.Sha3ModuleBackend=native",
844843
"<bytecode_dsl_build_args>",

0 commit comments

Comments
 (0)