Skip to content

Commit 8ad62a5

Browse files
committed
[GR-63253] Use the correct bootstrap GraalVM version for whether to add --sun-misc-unsafe-memory-access=allow.
PullRequest: js/3512
2 parents 39160b8 + a295534 commit 8ad62a5

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#
2727
# ----------------------------------------------------------------------------------------------------
2828

29-
import mx, mx_gate, mx_subst, mx_sdk, mx_sdk_vm, mx_graal_js, os, tempfile
29+
import mx, mx_gate, mx_subst, mx_sdk, mx_sdk_vm, mx_sdk_vm_ng, mx_graal_js, os, tempfile
3030
import mx_util
3131

3232
import mx_graal_nodejs_benchmark
@@ -459,7 +459,8 @@ def _prepare_build_env(build_env=None):
459459
# GR-59703: Migrate sun.misc.* usages.
460460
for flags_var in ('CXXFLAGS', 'CFLAGS'):
461461
other_flags = env.get(flags_var)
462-
_setEnvVar(flags_var, f"-DJAVA_FEATURE_VERSION={mx.get_jdk(tag='default').version.parts[0]}{' ' + other_flags if other_flags else ''}", env)
462+
java_version = mx_sdk_vm_ng.get_bootstrap_graalvm_jdk_version().parts[0]
463+
_setEnvVar(flags_var, f"-DJAVA_FEATURE_VERSION={java_version}{' ' + other_flags if other_flags else ''}", env)
463464

464465
if _current_os == 'darwin' and _current_arch == 'amd64':
465466
min_version = env.get('MACOSX_DEPLOYMENT_TARGET')

0 commit comments

Comments
 (0)