From 9bf2a7c7e5db5613b494a8cd8cb47b6aa9c3e7f6 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Sat, 12 Nov 2022 21:25:52 +0000 Subject: [PATCH] Meta: Use proper versions in is_compiler_supported check in serenity.sh We were checking the compilers against clang-12 and gcc-10. Since the check itself is confusing, some comments are warranted. --- Meta/serenity.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Meta/serenity.sh b/Meta/serenity.sh index 63ce4cbfcd..2d1dce6b6a 100755 --- a/Meta/serenity.sh +++ b/Meta/serenity.sh @@ -156,9 +156,11 @@ is_supported_compiler() { if $COMPILER --version 2>&1 | grep "Apple clang" >/dev/null; then return 1 elif $COMPILER --version 2>&1 | grep "clang" >/dev/null; then - [ "$MAJOR_VERSION" -gt 12 ] && return 0 + # Clang version check + [ "$MAJOR_VERSION" -ge 13 ] && return 0 else - [ "$MAJOR_VERSION" -gt 10 ] && return 0 + # GCC version check + [ "$MAJOR_VERSION" -ge 12 ] && return 0 fi return 1 }