Skip to content

Commit 0f59d5c

Browse files
committed
8324185: [8u] Accept Xcode 12+ builds on macOS
Reviewed-by: phh, andrew
1 parent c6ba33e commit 0f59d5c

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

common/autoconf/generated-configure.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4440,7 +4440,7 @@ VS_TOOLSET_SUPPORTED_2022=true
44404440
#CUSTOM_AUTOCONF_INCLUDE
44414441

44424442
# Do not change or remove the following line, it is needed for consistency checks:
4443-
DATE_WHEN_GENERATED=1704508692
4443+
DATE_WHEN_GENERATED=1705630975
44444444

44454445
###############################################################################
44464446
#
@@ -27586,13 +27586,6 @@ fi
2758627586
as_fn_error $? "The xcodebuild tool was not found, the Xcode command line tools are required to build on Mac OS X" "$LINENO" 5
2758727587
fi
2758827588

27589-
# Fail-fast: verify we're building on a supported Xcode version
27590-
XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'`
27591-
XC_VERSION_PARTS=( ${XCODE_VERSION//./ } )
27592-
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
27593-
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
27594-
fi
27595-
2759627589
# Some versions of Xcode command line tools install gcc and g++ as symlinks to
2759727590
# clang and clang++, which will break the build. So handle that here if we need to.
2759827591
if test -L "/usr/bin/gcc" -o -L "/usr/bin/g++"; then
@@ -57465,4 +57458,3 @@ fi
5746557458
printf "\n"
5746657459
fi
5746757460
fi
57468-

common/autoconf/toolchain.m4

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -287,13 +287,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
287287
AC_MSG_ERROR([The xcodebuild tool was not found, the Xcode command line tools are required to build on Mac OS X])
288288
fi
289289
290-
# Fail-fast: verify we're building on a supported Xcode version
291-
XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'`
292-
XC_VERSION_PARTS=( ${XCODE_VERSION//./ } )
293-
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
294-
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.])
295-
fi
296-
297290
# Some versions of Xcode command line tools install gcc and g++ as symlinks to
298291
# clang and clang++, which will break the build. So handle that here if we need to.
299292
if test -L "/usr/bin/gcc" -o -L "/usr/bin/g++"; then

0 commit comments

Comments
 (0)