Mercurial > hg > openjdk > jdk8u
changeset 2547:5892050572b3 jdk8u302-b05
8250876: Fix issues with cross-compile on macos
Reviewed-by: erikj, ihse
Contributed-by: benty@amazon.com
| author | vkempik |
|---|---|
| date | Mon, 10 Aug 2020 22:42:09 +0300 |
| parents | 14f5c4deb6d9 |
| children | d2e85075e016 |
| files | common/autoconf/toolchain.m4 |
| diffstat | 1 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/toolchain.m4 Tue May 25 05:53:02 2021 +0100 +++ b/common/autoconf/toolchain.m4 Mon Aug 10 22:42:09 2020 +0300 @@ -327,12 +327,14 @@ CXXFLAGS_JDK="${CXXFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\"" LDFLAGS_JDK="${LDFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\"" fi - - # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework - # setting this here means it doesn't have to be peppered throughout the forest - CFLAGS_JDK="$CFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\"" - CXXFLAGS_JDK="$CXXFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\"" - LDFLAGS_JDK="$LDFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\"" + + if test -d "$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks" ; then + # These always need to be set on macOS 10.X, 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 + CFLAGS_JDK="$CFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\"" + CXXFLAGS_JDK="$CXXFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\"" + LDFLAGS_JDK="$LDFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\"" + fi fi # For solaris we really need solaris tools, and not the GNU equivalent. @@ -764,9 +766,14 @@ # FIXME: we should list the discovered compilers as an exclude pattern! # If we do that, we can do this detection before POST_DETECTION, and still # find the build compilers in the tools dir, if needed. - BASIC_PATH_PROGS(BUILD_CC, [cl cc gcc]) + if test "x$OPENJDK_BUILD_OS" = xmacosx; then + BASIC_PATH_PROGS(BUILD_CC, [clang cl cc gcc]) + BASIC_PATH_PROGS(BUILD_CXX, [clang++ cl CC g++]) + else + BASIC_REQUIRE_PROGS(BUILD_CC, [cl cc gcc]) + BASIC_REQUIRE_PROGS(BUILD_CXX, [cl CC g++]) + fi BASIC_FIXUP_EXECUTABLE(BUILD_CC) - BASIC_PATH_PROGS(BUILD_CXX, [cl CC g++]) BASIC_FIXUP_EXECUTABLE(BUILD_CXX) BASIC_PATH_PROGS(BUILD_LD, ld) BASIC_FIXUP_EXECUTABLE(BUILD_LD)