From c5187845463f65bd3256a431f7c8d9cac7059157 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Thu, 20 Nov 2025 16:02:11 +0100 Subject: [PATCH] Set the correct org.graalvm.version when building unchained standalones * It would use the SDK suite version, which does not match if BOOTSTRAP_GRAALVM is set. --- sdk/mx.sdk/mx_sdk_vm_ng.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/mx.sdk/mx_sdk_vm_ng.py b/sdk/mx.sdk/mx_sdk_vm_ng.py index 1c00b7e1f95f..ca49345124da 100644 --- a/sdk/mx.sdk/mx_sdk_vm_ng.py +++ b/sdk/mx.sdk/mx_sdk_vm_ng.py @@ -460,7 +460,7 @@ def get_build_args(self): '--parallelism=' + str(self.parallelism), '--link-at-build-time', # we want "25.0.0-dev" and not "dev" (the default used in NativeImage#prepareImageBuildArgs) - '-Dorg.graalvm.version={}'.format(_suite.release_version()), + '-Dorg.graalvm.version={}'.format(get_bootstrap_graalvm_version()), ] + mx_sdk_vm_impl.svm_experimental_options(experimental_build_args) if os.environ.get('JVMCI_VERSION_CHECK'): # Propagate this env var when running native image from mx @@ -619,7 +619,7 @@ def cflags(self): '-O3', # Note: no -g to save 0.2MB on Linux '-DCP_SEP=' + os.pathsep, '-DDIR_SEP=' + ('\\\\' if mx.is_windows() else '/'), - '-DGRAALVM_VERSION=' + _suite.release_version(), + f'-DGRAALVM_VERSION={get_bootstrap_graalvm_version()}', ] if not mx.is_windows(): _dynamic_cflags += ['-pthread']