From d2e4565f72e80428cbd851d45a826c720fdb569d Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Sat, 17 Dec 2022 15:35:22 -0700 Subject: [PATCH] Meta: Allow building with Apple clang 14.x We previously disregarded Apple clang entirely, since no released version was able to succesfully build Lagom. Xcode 14 seems to have all the features we need, as we haven't added any code that needs trunk clang features in quite a while. --- Meta/serenity.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Meta/serenity.sh b/Meta/serenity.sh index 08b4cf6190..9db6b614d0 100755 --- a/Meta/serenity.sh +++ b/Meta/serenity.sh @@ -154,7 +154,8 @@ is_supported_compiler() { local MAJOR_VERSION="" MAJOR_VERSION="${VERSION%%.*}" if $COMPILER --version 2>&1 | grep "Apple clang" >/dev/null; then - return 1 + # Apple Clang version check + [ "$MAJOR_VERSION" -ge 14 ] && return 0 elif $COMPILER --version 2>&1 | grep "clang" >/dev/null; then # Clang version check [ "$MAJOR_VERSION" -ge 13 ] && return 0 @@ -172,9 +173,6 @@ find_newest_compiler() { if ! command -v "$CANDIDATE" >/dev/null 2>&1; then continue fi - if $CANDIDATE --version 2>&1 | grep "Apple clang" >/dev/null; then - continue - fi if ! $CANDIDATE -dumpversion >/dev/null 2>&1; then continue fi