Skip to content

Set the correct org.graalvm.version when building unchained standalones #12574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −2
Open

Set the correct org.graalvm.version when building unchained standalones #12574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdk/mx.sdk/mx_sdk_vm_ng.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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']
Expand Down