darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2025-04-12 00:36:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[macos] Don't search for frameworks below JavaVM.framework in newer SDKs

Browse Source 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2020-03-27 21:00:05 -07:00
parent 2056652bef
commit 9eaae342d1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/autoconf/flags.m4
View File

@ -235,10 +235,12 @@ AC_DEFUN([FLAGS_SETUP_SYSROOT_FLAGS],
fi
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
# These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
# set this here so it doesn't have to be peppered throughout the forest
$1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
$1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
if test -d "[$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks" ; then
# These need to be set with macOS 10.15 and earlier SDKS, or we can't find the frameworks embedded
# in JavaVM.framework. Set this here so it doesn't have to be peppered throughout the forest.
$1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
$1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
fi
fi
AC_SUBST($1SYSROOT_CFLAGS)