Skip to content

Commit 0fe565e

Browse files
committed
[GR-63253] Fix arguments passed to native image for unchained standalones
PullRequest: graal/20697
2 parents 1d8c93b + 2a7583b commit 0fe565e

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.45.3",
7+
"mx_version": "7.49.0",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {

sdk/mx.sdk/mx_sdk_vm_ng.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,8 @@ def get_build_args(self):
419419
experimental_build_args += ['-H:CCompilerOption=' + e for e in self.args.alt_cflags.split()]
420420
if self.args.alt_ldflags is not None:
421421
experimental_build_args += ['-H:NativeLinkerOption=' + e for e in self.args.alt_ldflags.split()]
422-
build_args += mx.get_runtime_jvm_args(self.subject.deps) + [
422+
classpath_and_modulepath = mx.get_runtime_jvm_args(self.subject.deps, include_system_properties=False)
423+
build_args += classpath_and_modulepath + [
423424
'--no-fallback',
424425
'-march=compatibility', # Target maximum portability
425426
'--parallelism=' + str(self.parallelism),

sdk/mx.sdk/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
# SOFTWARE.
4040
#
4141
suite = {
42-
"mxversion": "7.45.0",
42+
"mxversion": "7.49.0",
4343
"name" : "sdk",
4444
"version" : "25.0.0",
4545
"release" : False,

0 commit comments

Comments
 (0)