Modify native image builder args for graalos

Author: timfel

mx.graalpython/mx_graalpython.py

@@ -267,13 +267,17 @@ def libpythonvm_build_args():
     build_args = []
     build_args += bytecode_dsl_build_args()
 
-    if (
-            mx_sdk_vm_ng.is_nativeimage_ee()
-            and mx.is_linux()
-            and not os.environ.get('NATIVE_IMAGE_AUXILIARY_ENGINE_CACHE')
-            and not _is_overridden_native_image_arg("--gc")
-    ):
-        build_args += ['--gc=G1', '-H:-ProtectionKeys']
+    if mx.is_linux():
+        if "musl" in mx_subst.path_substitutions.substitute("<multitarget_libc_selection>"):
+            build_args += ['-H:+GraalOS']
+        else:
+            build_args += ["-Dpolyglot.image-build-time.PreinitializeContexts=python"]
+            if (
+                    mx_sdk_vm_ng.is_nativeimage_ee()
+                    and not os.environ.get('NATIVE_IMAGE_AUXILIARY_ENGINE_CACHE')
+                    and not _is_overridden_native_image_arg("--gc")
+            ):
+                build_args += ['--gc=G1', '-H:-ProtectionKeys']
 
     profile = None
     if (

mx.graalpython/suite.py

@@ -843,7 +843,6 @@
             ],
             "build_args": [
                 # From mx.graalpython/native-image.properties
-                "-Dpolyglot.image-build-time.PreinitializeContexts=python",
                 "--add-exports", "org.graalvm.nativeimage/org.graalvm.nativeimage.impl=ALL-UNNAMED",
                 "-R:StackSize=16777216",
                 "-H:+AddAllCharsets",