1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8283260: gcc is not supported on mac

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2022-03-16 16:07:32 +00:00
parent 08cadb4754
commit 9b8afce379
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
make/autoconf/flags-ldflags.m4
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -95,13 +95,10 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
fi fi
# Setup OS-dependent LDFLAGS # Setup OS-dependent LDFLAGS
if test "x$TOOLCHAIN_TYPE" = xclang || test "x$TOOLCHAIN_TYPE" = xgcc; then if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$TOOLCHAIN_TYPE" = xclang; then
if test "x$OPENJDK_TARGET_OS" = xmacosx; then # FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead.
# Assume clang or gcc. OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
# FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead. OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN"
OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN"
fi
fi fi
# Setup debug level-dependent LDFLAGS # Setup debug level-dependent LDFLAGS

6
make/autoconf/toolchain.m4
View File

@ -39,7 +39,7 @@ VALID_TOOLCHAINS_all="gcc clang xlc microsoft"
# These toolchains are valid on different platforms # These toolchains are valid on different platforms
VALID_TOOLCHAINS_linux="gcc clang" VALID_TOOLCHAINS_linux="gcc clang"
VALID_TOOLCHAINS_macosx="gcc clang" VALID_TOOLCHAINS_macosx="clang"
VALID_TOOLCHAINS_aix="xlc" VALID_TOOLCHAINS_aix="xlc"
VALID_TOOLCHAINS_windows="microsoft" VALID_TOOLCHAINS_windows="microsoft"
@ -901,8 +901,8 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
BUILD_LDCXX="$BUILD_LD" BUILD_LDCXX="$BUILD_LD"
else else
if test "x$OPENJDK_BUILD_OS" = xmacosx; then if test "x$OPENJDK_BUILD_OS" = xmacosx; then
UTIL_REQUIRE_PROGS(BUILD_CC, clang cc gcc) UTIL_REQUIRE_PROGS(BUILD_CC, clang)
UTIL_REQUIRE_PROGS(BUILD_CXX, clang++ CC g++) UTIL_REQUIRE_PROGS(BUILD_CXX, clang++)
else else
UTIL_REQUIRE_PROGS(BUILD_CC, cc gcc) UTIL_REQUIRE_PROGS(BUILD_CC, cc gcc)
UTIL_REQUIRE_PROGS(BUILD_CXX, CC g++) UTIL_REQUIRE_PROGS(BUILD_CXX, CC g++)