kfr

commit 347eda1ed75cbbb775a02bbeebb0d3b16fb7e96f
parent 67023873ec28742098eceaac154ba7ce363aff54
Author: [email protected] <[email protected]>
Date:   Wed, 25 Jan 2023 14:56:47 +0000

CLANG_SUFFIX instead of update-alternatives

Diffstat:
M
azure-pipelines.yml
 | 
8
++------
M
cmake/aarch64.cmake
 | 
8
++++++--
M
cmake/arm.cmake
 | 
4
++--

3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -149,9 +149,7 @@ jobs:
   - bash: |
       set -e
       sudo apt-get update && sudo apt-get install -y ninja-build g++-arm-linux-gnueabihf qemu qemu-system-arm qemu-user clang-12
-      sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 100
-      sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 100
-      ci/run.sh build-release -DENABLE_TESTS=ON -DENABLE_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release -DGCC_VER=9 -DCMAKE_TOOLCHAIN_FILE=../cmake/arm.cmake
+      ci/run.sh build-release -DENABLE_TESTS=ON -DENABLE_EXAMPLES=OFF -DCLANG_SUFFIX=-12 -DCMAKE_BUILD_TYPE=Release -DGCC_VER=9 -DCMAKE_TOOLCHAIN_FILE=../cmake/arm.cmake
 
 - job: Linux_ARM64_Clang12_Release
   timeoutInMinutes: 180
@@ -161,9 +159,7 @@ jobs:
   - bash: |
       set -e
       sudo apt-get update && sudo apt-get install -y ninja-build g++-aarch64-linux-gnu qemu qemu-system-arm qemu-user clang-12
-      sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 100
-      sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 100
-      ci/run.sh build-release -DENABLE_TESTS=ON -DENABLE_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release -DGCC_VER=9 -DCMAKE_TOOLCHAIN_FILE=../cmake/aarch64.cmake
+      ci/run.sh build-release -DENABLE_TESTS=ON -DENABLE_EXAMPLES=OFF -DCLANG_SUFFIX=-12 -DCMAKE_BUILD_TYPE=Release -DGCC_VER=9 -DCMAKE_TOOLCHAIN_FILE=../cmake/aarch64.cmake
 
 - job: macOSBigSur_x86_64_Clang_Release
   timeoutInMinutes: 180
diff --git a/cmake/aarch64.cmake b/cmake/aarch64.cmake
@@ -8,9 +8,13 @@ set (AARCH64 True)
 set (CMAKE_SYSTEM_PROCESSOR aarch64)
 set (EMULATOR qemu-aarch64)
 
+if (NOT CLANG_SUFFIX)
+    set (CLANG_SUFFIX "")
+endif ()
+
 include (CMakeForceCompiler)
-CMAKE_FORCE_CXX_COMPILER (/usr/bin/clang++ Clang)
-CMAKE_FORCE_C_COMPILER (/usr/bin/clang Clang)
+CMAKE_FORCE_CXX_COMPILER (/usr/bin/clang++${CLANG_SUFFIX} Clang)
+CMAKE_FORCE_C_COMPILER (/usr/bin/clang${CLANG_SUFFIX} Clang)
 set (CMAKE_CXX_COMPILER_WORKS TRUE)
 set (CMAKE_C_COMPILER_WORKS TRUE)
 
diff --git a/cmake/arm.cmake b/cmake/arm.cmake
@@ -8,8 +8,8 @@ set (CMAKE_SYSTEM_PROCESSOR arm)
 set (EMULATOR qemu-arm)
 
 include (CMakeForceCompiler)
-CMAKE_FORCE_CXX_COMPILER (/usr/bin/clang++ Clang)
-CMAKE_FORCE_C_COMPILER (/usr/bin/clang Clang)
+CMAKE_FORCE_CXX_COMPILER (/usr/bin/clang${CLANG_SUFFIX}++ Clang)
+CMAKE_FORCE_C_COMPILER (/usr/bin/clang${CLANG_SUFFIX} Clang)
 set (CMAKE_CXX_COMPILER_WORKS TRUE)
 set (CMAKE_C_COMPILER_WORKS TRUE)