Skip to content

Commit 67da9d5

Browse files
committed
[LLVM] Change CLANG cmake variable to TPDE_CLANG to avoid name clashes
1 parent c857798 commit 67da9d5

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

tpde-llvm/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ target_sources(tpde_llvm PRIVATE
6060
src/LLVMCompilerBase.hpp
6161
)
6262

63-
set(CLANG_HINTS "")
63+
set(TPDE_CLANG_HINTS "")
6464
if (DEFINED LLVM_DIR)
65-
set(CLANG_HINTS "${LLVM_DIR}/../clang")
65+
set(TPDE_CLANG_HINTS "${LLVM_DIR}/../clang")
6666
endif ()
6767

6868
function(check_clang_version validator_result_var CANDIDATE)
@@ -89,16 +89,16 @@ function(check_clang_version validator_result_var CANDIDATE)
8989
endif ()
9090
endif ()
9191
endfunction()
92-
find_program(CLANG NO_CACHE REQUIRED
92+
find_program(TPDE_CLANG NO_CACHE REQUIRED
9393
NAMES clang-${LLVM_VERSION_MAJOR} clang-20 clang-19 clang-18 clang
9494
HINTS ${LLVM_TOOLS_BINARY_DIR}
9595
VALIDATOR check_clang_version)
96-
message(STATUS "Found Clang: " ${CLANG})
96+
message(STATUS "Found Clang: " ${TPDE_CLANG})
9797

9898
if (TPDE_X64)
9999
add_custom_command(
100100
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/encode_template_x64.bc
101-
COMMAND ${CLANG} -c -emit-llvm -ffreestanding -fcf-protection=none
101+
COMMAND ${TPDE_CLANG} -c -emit-llvm -ffreestanding -fcf-protection=none
102102
-O3 -fomit-frame-pointer -fno-math-errno
103103
--target=x86_64-linux -march=x86-64-v4
104104
-o ${CMAKE_CURRENT_BINARY_DIR}/encode_template_x64.bc
@@ -136,7 +136,7 @@ endif ()
136136
if (TPDE_A64)
137137
add_custom_command(
138138
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/encode_template_arm64.bc
139-
COMMAND ${CLANG} -c -emit-llvm -ffreestanding -fcf-protection=none
139+
COMMAND ${TPDE_CLANG} -c -emit-llvm -ffreestanding -fcf-protection=none
140140
-O3 -fomit-frame-pointer -fno-math-errno
141141
--target=aarch64 -march=armv8.1-a
142142
-o ${CMAKE_CURRENT_BINARY_DIR}/encode_template_arm64.bc

0 commit comments

Comments
 (0)