diff options
| author | Ed J <mohawk2@users.noreply.github.com> | 2018-04-03 21:58:52 +0100 |
|---|---|---|
| committer | Ed J <mohawk2@users.noreply.github.com> | 2018-04-03 21:58:52 +0100 |
| commit | 0d962c9fbb604fdb01513cd706c0b9ba50bba8e3 (patch) | |
| tree | ec042b23c1a3111279c8ae56353e15f80a40638d | |
| parent | 9d57c4adb3da0240a8b9ef8d6a87047e36139b15 (diff) | |
support old and apparently-new JDK locations on OSX [RT#116917]
| -rw-r--r-- | lib/Inline/Java/Portable.pm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/Inline/Java/Portable.pm b/lib/Inline/Java/Portable.pm index 083721c..3a0adde 100644 --- a/lib/Inline/Java/Portable.pm +++ b/lib/Inline/Java/Portable.pm @@ -241,9 +241,15 @@ my $map = { JVM_SO => "libjvm.dylib", PRE_WHOLE_ARCHIVE => '-Wl', POST_WHOLE_ARCHIVE => '-Wl', - GOT_SYMLINK => 1, + GOT_SYMLINK => 1, J2SDK_BIN => 'Commands', - DEFAULT_J2SDK_DIR => '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK', + DEFAULT_J2SDK_DIR => sub { + for my $suffix (qw(Current CurrentJDK)) { + my $dir = "/System/Library/Frameworks/JavaVM.framework/Versions/$suffix"; + return $dir if -d $dir; + } + undef; + }, # Tim Bunce: OTHERLDFLAGS => '-framework JavaVM', }, |