[GR-33796] Non-jlinked-build fixes for breakage after cc11ae1 #3793
Conversation
jerboaa
force-pushed
the
build_break_ni_agent_3778
branch
from
fed7e68 to
5e4b8fa
Compare
substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
Outdated
Show resolved
Hide resolved
substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
Outdated
Show resolved
Hide resolved
substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
Outdated
Show resolved
Hide resolved
jerboaa
force-pushed
the
build_break_ni_agent_3778
branch
from
5e4b8fa to
df8e8e3
Compare
Only perform nashorn substitutions if that module is actulally loaded as it would otherwise affect JDK 9+ builds. cc11ae1 re-ordered arguments passed to the native image generator. Move code to after compiler specific flags get added, which includes -XX:+UnlockExperimentalVMOptions. Add relevant modules to the module path for module-based builds like 'native-image --macro:native-image-agent-library' as not all JDKs have truffle and sdk modules in the default module path. Closes oracle#3778
jerboaa
force-pushed
the
build_break_ni_agent_3778
branch
from
df8e8e3 to
c17a8f4
Compare
|
I believe I've fixed the checkstyle warning now. Lets see what the gates tell us. It's now also rebased on latest master, which should fix the gate's failures on debuginfo tests. |
...src/com/oracle/svm/core/jdk/Target_jdk_nashorn_api_scripting_NashornScriptEngineFactory.java
Show resolved
Hide resolved
olpaw
changed the title
olpaw
force-pushed
the
build_break_ni_agent_3778
branch
from
c17a8f4 to
d9fb0b7
Compare
|
@jerboaa I accidentally force-pushed to https://github.com/jerboaa/graal.git instead of our internal repo 😬 . Please ignore that (and the strange side effect of this PR getting closed). I add a comment once your PR ran though our CI. |
OK, thanks. |
|
jerboaa@c17a8f4 is the commit which is intended to be pushed to graal master with this PR. |
Yes that's the one that is currently running in our CI. |
|
The PR is in the merge queue. |
The upstream fix was: oracle/graal#3793
The upstream fix was: oracle/graal#3793
Add jdk.scripting.nashorn modules for module look-up on JDK 11.
Target_jdk_nashorn_api_scripting_ClassFilter substitution needs nashorn
target class loaded.
cc11ae1 re-ordered arguments passed to
the native image generator. Add -XX:+UnlockExperimentalVMOptions before
actually using any one of those experimental options as that's needed
for some JVMs.
Add relevant modules to the upgraded module path list since for
non-jlinked-builds they are either not there or too old.
Closes #3778