Skip to content

[GR-69868] load .jnilib on MacOS from the native-image executable directory #6823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[GR-69868] load .jnilib on MacOS from the native-image executable directory #6823

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/NativeLibrarySupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,22 +120,29 @@ public void loadLibraryRelative(String name) {
usrPaths = tokens;
}
String libname = System.mapLibraryName(name);
if (sysPath != null && loadLibrary0(new File(sysPath, libname), false)) {
if (sysPath != null && loadLibraryFromPath(sysPath, libname)) {
return;
}
for (String path : usrPaths) {
File libpath = new File(path, libname);
if (loadLibrary0(libpath, false)) {
return;
}
File altpath = Target_jdk_internal_loader_ClassLoaderHelper.mapAlternativeName(libpath);
if (altpath != null && loadLibrary0(altpath, false)) {
if (loadLibraryFromPath(path, libname)) {
return;
}
}
throw new UnsatisfiedLinkError("no " + name + " in java.library.path");
}

private boolean loadLibraryFromPath(String path, String libname) {
File libpath = new File(path, libname);
if (loadLibrary0(libpath, false)) {
return true;
}
File altpath = Target_jdk_internal_loader_ClassLoaderHelper.mapAlternativeName(libpath);
if (altpath != null && loadLibrary0(altpath, false)) {
return true;
}
return false;
}

/** Returns the directory containing the native image, or {@code null}. */
@NeverInline("Reads the return address.")
private static String getImageDirectory() {
Expand Down