Skip to content

Commit

Permalink
Use the "default" directory to access J9's libjvm
Browse files Browse the repository at this point in the history
Workaround for eclipse-openj9/openj9#14397.

Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
  • Loading branch information
babsingh committed Feb 9, 2022
1 parent 56e8e42 commit eeece82
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions test/lib/jdk/test/lib/Platform.java
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ public static Path libDir() {
public static Path libDir(Path image) {
if (Platform.isWindows()) {
return image.resolve("bin");
} else {
} else {
return image.resolve("lib");
}
}
Expand All @@ -364,7 +364,11 @@ public static Path libDir(Path image) {
* Returns absolute path to directory containing JVM shared library.
*/
public static Path jvmLibDir() {
return libDir().resolve(variant());
if (isJ9()) {
return libDir().resolve("default");
} else {
return libDir().resolve(variant());
}
}

private static String variant() {
Expand Down

0 comments on commit eeece82

Please sign in to comment.