Skip to content

Commit 633e62a

Browse files
jirkamarsikansalond
authored andcommitted
[GR-68100] Backport to 25: Build Graal.js and GraalNode.js native standalones without Vector API.
PullRequest: js/3573
2 parents 6073998 + 44cb2a6 commit 633e62a

File tree

2 files changed

+24
-10
lines changed

2 files changed

+24
-10
lines changed

graal-js/mx.graal-js/mx_graal_js.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -547,17 +547,24 @@ def graaljs_standalone_deps():
547547
return deps
548548

549549
def libjsvm_build_args():
550+
image_build_args = []
551+
if mx_sdk_vm_ng.get_bootstrap_graalvm_jdk_version() < mx.VersionSpec("25"):
552+
image_build_args.extend([
553+
'--exclude-config',
554+
r'wasm\.jar',
555+
r'META-INF/native-image/org\.graalvm\.wasm/wasm-language/native-image\.properties',
556+
'--initialize-at-build-time=org.graalvm.wasm',
557+
'-H:MaxRuntimeCompileMethods=2000',
558+
])
550559
if is_nativeimage_ee() and not mx.is_windows():
551-
image_build_args = [
560+
image_build_args.extend([
552561
'-H:+AuxiliaryEngineCache',
553562
'-H:ReservedAuxiliaryImageBytes=2145482548',
554-
]
563+
])
555564
# GR-64948: On GraalVM 21 some Native Image stable options are incorrectly detected as experimental
556565
if mx_sdk_vm_ng.get_bootstrap_graalvm_jdk_version() < mx.VersionSpec("25"):
557566
image_build_args = ['-H:+UnlockExperimentalVMOptions', *image_build_args, '-H:-UnlockExperimentalVMOptions']
558-
return image_build_args
559-
else:
560-
return []
567+
return image_build_args
561568

562569
mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
563570
suite=_suite,

graal-nodejs/mx.graal-nodejs/mx_graal_nodejs.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -635,17 +635,24 @@ def graalnodejs_standalone_deps():
635635
return deps
636636

637637
def libgraalnodejs_build_args():
638+
image_build_args = []
639+
if mx_sdk_vm_ng.get_bootstrap_graalvm_jdk_version() < mx.VersionSpec("25"):
640+
image_build_args.extend([
641+
'--exclude-config',
642+
r'wasm\.jar',
643+
r'META-INF/native-image/org\.graalvm\.wasm/wasm-language/native-image\.properties',
644+
'--initialize-at-build-time=org.graalvm.wasm',
645+
'-H:MaxRuntimeCompileMethods=2000',
646+
])
638647
if is_nativeimage_ee() and not mx.is_windows():
639-
image_build_args = [
648+
image_build_args.extend([
640649
'-H:+AuxiliaryEngineCache',
641650
'-H:ReservedAuxiliaryImageBytes=2145482548',
642-
]
651+
])
643652
# GR-64948: On GraalVM 21 some Native Image stable options are incorrectly detected as experimental
644653
if mx_sdk_vm_ng.get_bootstrap_graalvm_jdk_version() < mx.VersionSpec("25"):
645654
image_build_args = ['-H:+UnlockExperimentalVMOptions', *image_build_args, '-H:-UnlockExperimentalVMOptions']
646-
return image_build_args
647-
else:
648-
return []
655+
return image_build_args
649656

650657
mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
651658
suite=_suite,

0 commit comments

Comments
 (0)