From 81b6723b29dbf159007436f3c4eaf6784df12620 Mon Sep 17 00:00:00 2001 From: Daniel Bertalan Date: Sun, 21 May 2023 14:12:37 +0200 Subject: Meta: Add GCC 13 and Clang 16 to compiler autodetection --- Meta/Lagom/BuildFuzzers.sh | 2 +- Meta/serenity.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Meta/Lagom/BuildFuzzers.sh b/Meta/Lagom/BuildFuzzers.sh index da995648c1..cf5f2fddde 100755 --- a/Meta/Lagom/BuildFuzzers.sh +++ b/Meta/Lagom/BuildFuzzers.sh @@ -14,7 +14,7 @@ die() { pick_clang() { local BEST_VERSION=0 - for CLANG_CANDIDATE in clang clang-14 clang-15 /opt/homebrew/opt/llvm/bin/clang ; do + for CLANG_CANDIDATE in clang clang-14 clang-15 clang-16 /opt/homebrew/opt/llvm/bin/clang ; do if ! command -v $CLANG_CANDIDATE >/dev/null 2>&1; then continue fi diff --git a/Meta/serenity.sh b/Meta/serenity.sh index deb8bf4986..35c1679521 100755 --- a/Meta/serenity.sh +++ b/Meta/serenity.sh @@ -191,14 +191,14 @@ pick_host_compiler() { return fi - find_newest_compiler clang clang-14 clang-15 /opt/homebrew/opt/llvm/bin/clang + find_newest_compiler clang clang-14 clang-15 clang-16 /opt/homebrew/opt/llvm/bin/clang if is_supported_compiler "$HOST_COMPILER"; then export CC="${HOST_COMPILER}" export CXX="${HOST_COMPILER/clang/clang++}" return fi - find_newest_compiler egcc gcc gcc-12 /usr/local/bin/gcc-12 /opt/homebrew/bin/gcc-12 + find_newest_compiler egcc gcc gcc-12 gcc-13 /usr/local/bin/gcc-{12,13} /opt/homebrew/bin/gcc-{12,13} if is_supported_compiler "$HOST_COMPILER"; then export CC="${HOST_COMPILER}" export CXX="${HOST_COMPILER/gcc/g++}" -- cgit v1.2.3