From fe30d7d432dc3cc6ab11cd71a1d0acc9baf98680 Mon Sep 17 00:00:00 2001 From: Joel Winarske Date: Wed, 22 Jan 2025 18:36:58 -0800 Subject: [PATCH] LLVM_CONFIG cmake variable -enable setting toolchain via LLVM_CONFIG Signed-off-by: Joel Winarske --- cmake/context.cmake | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cmake/context.cmake b/cmake/context.cmake index 91e809c2..facc2c8c 100644 --- a/cmake/context.cmake +++ b/cmake/context.cmake @@ -34,8 +34,11 @@ endif () # libc++ # if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + if (NOT LLVM_CONFIG) + set(LLVM_CONFIG llvm-config) + endif () execute_process( - COMMAND llvm-config --version + COMMAND ${LLVM_CONFIG} --version OUTPUT_VARIABLE LLVM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) @@ -45,14 +48,14 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") if (NOT LLVM_ROOT) execute_process( - COMMAND llvm-config --prefix + COMMAND ${LLVM_CONFIG} --prefix OUTPUT_VARIABLE LLVM_ROOT OUTPUT_STRIP_TRAILING_WHITESPACE ) endif () if (NOT LLVM_ROOT) - message(WARNING "LLVM_ROOT not detected, using default") + message(WARNING "LLVM_ROOT not detected, using system default") set(LLVM_ROOT "/usr") endif () @@ -63,7 +66,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CONTEXT_COMPILE_OPTIONS $<$:-stdlib=libc++> $<$:-isystem${LLVM_ROOT}/include/c++/v1/>) execute_process( - COMMAND llvm-config --cmakedir + COMMAND ${LLVM_CONFIG} --cmakedir OUTPUT_VARIABLE LLVM_CMAKE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE )