Skip to content

Commit d453c48

Browse files
committed
Use -Dgraal instead of -Djdk.graal so it also works on GraalVM for JDK 21
1 parent 34699c2 commit d453c48

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ci.jsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ local part_definitions = {
216216
"--extra-image-builder-argument=rubyvm:-H:+TruffleHostInliningPrintExplored",
217217
"--extra-image-builder-argument=rubyvm:-H:MethodFilter=org.truffleruby.*.*",
218218
"--extra-image-builder-argument=rubyvm:-H:-UnlockExperimentalVMOptions",
219-
"--extra-image-builder-argument=rubyvm:-Djdk.graal.LogFile=host-inlining.txt",
219+
"--extra-image-builder-argument=rubyvm:-Dgraal.LogFile=host-inlining.txt",
220220
],
221221
environment+: {
222222
TRUFFLERUBY_HOST_INLINING_TEST: "1",

mx.truffleruby/native-ee-host-inlining

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/sulong-managed,/su
22
BUILD_TARGETS=TRUFFLERUBY_NATIVE_STANDALONE
33
COMPONENTS=SubstrateVM Enterprise,Truffle SVM Macro Enterprise,suite:substratevm-enterprise-gcs
44
NATIVE_IMAGES=lib:rubyvm
5-
EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+UnlockExperimentalVMOptions rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:Log=HostInliningPhase,~CanonicalizerPhase,~GraphBuilderPhase rubyvm:-H:+TruffleHostInliningPrintExplored rubyvm:-H:MethodFilter=org.truffleruby.*.* rubyvm:-H:-UnlockExperimentalVMOptions rubyvm:-Djdk.graal.LogFile=host-inlining.txt
5+
EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+UnlockExperimentalVMOptions rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:Log=HostInliningPhase,~CanonicalizerPhase,~GraphBuilderPhase rubyvm:-H:+TruffleHostInliningPrintExplored rubyvm:-H:MethodFilter=org.truffleruby.*.* rubyvm:-H:-UnlockExperimentalVMOptions rubyvm:-Dgraal.LogFile=host-inlining.txt
66
GENERATE_DEBUGINFO=false
77
GRAALVM_SKIP_ARCHIVE=true

mx.truffleruby/native-host-inlining

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
22
BUILD_TARGETS=TRUFFLERUBY_NATIVE_STANDALONE
33
COMPONENTS=SubstrateVM,Truffle SVM Macro
44
NATIVE_IMAGES=lib:rubyvm
5-
EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+UnlockExperimentalVMOptions rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:Log=HostInliningPhase,~CanonicalizerPhase,~GraphBuilderPhase rubyvm:-H:+TruffleHostInliningPrintExplored rubyvm:-H:MethodFilter=org.truffleruby.*.* rubyvm:-H:-UnlockExperimentalVMOptions rubyvm:-Djdk.graal.LogFile=host-inlining.txt
5+
EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+UnlockExperimentalVMOptions rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:Log=HostInliningPhase,~CanonicalizerPhase,~GraphBuilderPhase rubyvm:-H:+TruffleHostInliningPrintExplored rubyvm:-H:MethodFilter=org.truffleruby.*.* rubyvm:-H:-UnlockExperimentalVMOptions rubyvm:-Dgraal.LogFile=host-inlining.txt
66
GENERATE_DEBUGINFO=false
77
GRAALVM_SKIP_ARCHIVE=true

0 commit comments

Comments
 (0)