From 6f99d551102ff334de8f4978be4a6a7eb110378c Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Wed, 28 Sep 2022 18:00:50 +0200 Subject: [PATCH] Support XCode 3-14 Co-authored-by: usersxx <97012123+usersxx@users.noreply.github.com> --- common/autoconf/generated-configure.sh +++ common/autoconf/generated-configure.sh @@ -27373,8 +27373,8 @@ # 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 + if test "${XC_VERSION_PARTS[0]}" -lt "3" ; then + as_fn_error $? "Xcode 3+ 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 --- common/autoconf/toolchain.m4 +++ common/autoconf/toolchain.m4 @@ -290,8 +290,8 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION], # 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.]) + if test "${XC_VERSION_PARTS[[0]]}" -lt "3" ; then + AC_MSG_ERROR([Xcode 3+ 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