[GR-39148] Backport to 21.3 : Enables native-image script to handle m…

…odule path with spaces. PullRequest: graal/11972
oracle · Jun 15, 2022 · 122df1d · 122df1d
2 parents 5f06a8f + 94f5f58
commit 122df1d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -1931,13 +1931,13 @@ def _get_extra_jvm_args():
             extra_jvm_args = mx.list_to_cmd_line(image_config.extra_jvm_args)
             if not _jlink_libraries() and _src_jdk_version >= 9:
                 if mx.is_windows():
-                    extra_jvm_args = ' '.join([extra_jvm_args, r"--upgrade-module-path %location%\..\..\jvmci\graal.jar",
-                                               r"--add-modules org.graalvm.truffle,org.graalvm.sdk",
-                                               r"--module-path %location%\..\..\truffle\truffle-api.jar:%location%\..\..\jvmci\graal-sdk.jar"])
+                    extra_jvm_args = ' '.join([extra_jvm_args, r'--upgrade-module-path "%location%\..\..\jvmci\graal.jar"',
+                                               r'--add-modules org.graalvm.truffle,org.graalvm.sdk',
+                                               r'--module-path "%location%\..\..\truffle\truffle-api.jar:%location%\..\..\jvmci\graal-sdk.jar"'])
                 else:
-                    extra_jvm_args = ' '.join([extra_jvm_args, "--upgrade-module-path ${location}/../../jvmci/graal.jar",
-                                               "--add-modules org.graalvm.truffle,org.graalvm.sdk",
-                                               "--module-path ${location}/../../truffle/truffle-api.jar:${location}/../../jvmci/graal-sdk.jar"])
+                    extra_jvm_args = ' '.join([extra_jvm_args, '--upgrade-module-path "${location}/../../jvmci/graal.jar"',
+                                               '--add-modules org.graalvm.truffle,org.graalvm.sdk',
+                                               '--module-path "${location}/../../truffle/truffle-api.jar:${location}/../../jvmci/graal-sdk.jar"'])
             return extra_jvm_args
 
         def _get_option_vars():