From d6a735fe62537fe67473f5c2847fd16fc7235e52 Mon Sep 17 00:00:00 2001 From: Daniel Bertalan Date: Sun, 10 Apr 2022 11:21:54 +0200 Subject: [PATCH] Meta: Use clang-format from the Clang toolchain if available --- Meta/lint-clang-format.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Meta/lint-clang-format.sh b/Meta/lint-clang-format.sh index 639a58ff49..5d2899790b 100755 --- a/Meta/lint-clang-format.sh +++ b/Meta/lint-clang-format.sh @@ -26,9 +26,12 @@ else fi if (( ${#files[@]} )); then + TOOLCHAIN_DIR=Toolchain/Local/clang/bin CLANG_FORMAT=false if command -v clang-format-14 >/dev/null 2>&1 ; then CLANG_FORMAT=clang-format-14 + elif command -v $TOOLCHAIN_DIR/clang-format >/dev/null 2>&1 && $TOOLCHAIN_DIR/clang-format --version | grep -qF ' 14.' ; then + CLANG_FORMAT=$TOOLCHAIN_DIR/clang-format elif command -v clang-format >/dev/null 2>&1 ; then CLANG_FORMAT=clang-format if ! "${CLANG_FORMAT}" --version | awk '{ if (substr($NF, 1, index($NF, ".") - 1) < 14) exit 1; }'; then