From 4688b5ce895761c884ae15fc0234ed8d623b988b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Tue, 2 Jul 2024 15:41:47 +0200 Subject: [PATCH] cmake: use clang from cmake variable --- cmake/LLVM.cmake | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake index 71b786dc7..f4dbda065 100644 --- a/cmake/LLVM.cmake +++ b/cmake/LLVM.cmake @@ -281,11 +281,29 @@ macro(find_program_or_die OUTPUT_VAR PROG_NAME DOCSTRING) endif() endmacro() -find_program_or_die( CLANG "clang" "clang binary") +# -DCMAKE_C_COMPILER=riscv64-unknown-linux-gnu-clang -DCMAKE_CXX_COMPILER=riscv64-unknown-linux-gnu-clang++ + +# if(DEFINED CLANG_EXECUTABLE) +if(DEFINED CMAKE_C_COMPILER) + # set(CLANG "${CLANG_EXECUTABLE}") + set(CLANG "${CMAKE_C_COMPILER}") + message(STATUS "Using CLANG_EXECUTABLE: ${CLANG}") +else() + find_program_or_die( CLANG "clang" "clang binary") +endif() execute_process(COMMAND "${CLANG}" "--version" OUTPUT_VARIABLE LLVM_CLANG_VERSION RESULT_VARIABLE CLANG_RES) + # TODO this should be optional -find_program_or_die( CLANGXX "clang++" "clang++ binary") +# if(DEFINED CLANGXX_EXECUTABLE) +if(DEFINED CMAKE_CXX_COMPILER) + # set(CLANGXX "${CLANGXX_EXECUTABLE}") + set(CLANGXX "${CMAKE_CXX_COMPILER}") + message(STATUS "Using CLANGXX_EXECUTABLE: ${CLANGXX}") +else() + find_program_or_die( CLANGXX "clang++" "clang++ binary") +endif() execute_process(COMMAND "${CLANGXX}" "--version" OUTPUT_VARIABLE LLVM_CLANGXX_VERSION RESULT_VARIABLE CLANGXX_RES) + if(CLANGXX_RES OR CLANG_RES) message(FATAL_ERROR "Failed running clang/clang++ --version") endif() -- 2.45.1