diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 85eb8a16a21..6f17436eff3 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -4440,7 +4440,7 @@ VS_TOOLSET_SUPPORTED_2022=true #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1704508692 +DATE_WHEN_GENERATED=1705630975 ############################################################################### # @@ -27586,13 +27586,6 @@ fi as_fn_error $? "The xcodebuild tool was not found, the Xcode command line tools are required to build on Mac OS X" "$LINENO" 5 fi - # Fail-fast: verify we're building on a supported Xcode version - XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'` - XC_VERSION_PARTS=( ${XCODE_VERSION//./ } ) - if test "${XC_VERSION_PARTS[0]}" != "6" -a "${XC_VERSION_PARTS[0]}" != "9" -a "${XC_VERSION_PARTS[0]}" != "10" -a "${XC_VERSION_PARTS[0]}" != "11" -a "${XC_VERSION_PARTS[0]}" != "12" ; then - as_fn_error $? "Xcode 6, 9-12 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode or make Xcode active by using xcode-select." "$LINENO" 5 - fi - # Some versions of Xcode command line tools install gcc and g++ as symlinks to # clang and clang++, which will break the build. So handle that here if we need to. if test -L "/usr/bin/gcc" -o -L "/usr/bin/g++"; then @@ -57465,4 +57458,3 @@ fi printf "\n" fi fi - diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 index ab0167a6191..ba4798e795f 100644 --- a/common/autoconf/toolchain.m4 +++ b/common/autoconf/toolchain.m4 @@ -287,13 +287,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION], AC_MSG_ERROR([The xcodebuild tool was not found, the Xcode command line tools are required to build on Mac OS X]) fi - # Fail-fast: verify we're building on a supported Xcode version - XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'` - XC_VERSION_PARTS=( ${XCODE_VERSION//./ } ) - if test "${XC_VERSION_PARTS[[0]]}" != "6" -a "${XC_VERSION_PARTS[[0]]}" != "9" -a "${XC_VERSION_PARTS[[0]]}" != "10" -a "${XC_VERSION_PARTS[[0]]}" != "11" -a "${XC_VERSION_PARTS[[0]]}" != "12" ; then - AC_MSG_ERROR([Xcode 6, 9-12 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode or make Xcode active by using xcode-select.]) - fi - # Some versions of Xcode command line tools install gcc and g++ as symlinks to # clang and clang++, which will break the build. So handle that here if we need to. if test -L "/usr/bin/gcc" -o -L "/usr/bin/g++"; then