authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-05-25 09:02:39-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-05-25 09:04:52-07:00
log793f820b393e0a79842b99afb008d13eb1343ed8
treea6b6855a6b3986adb4925c2091ba79b676bd8fcb
parent0b0625ccf494fcd94743179a3e6b02055db8ebe8

Revert "cmake/llvm: Don't unset LLVM_CONFIG_EXE"

This reverts commit 28476a5ee94d311319941b54e9da66210690ce70. It also adds a comment to explain the purpose of this line, to prevent this mistake from being repeated.

1 files changed, 4 insertions(+), 0 deletions(-)

cmake/Findllvm.cmake+4
...@@ -12,6 +12,10 @@...@@ -12,6 +12,10 @@
12if(ZIG_USE_LLVM_CONFIG)12if(ZIG_USE_LLVM_CONFIG)
13 set(LLVM_CONFIG_ERROR_MESSAGES "")13 set(LLVM_CONFIG_ERROR_MESSAGES "")
14 while(1)14 while(1)
15 # If this variable is not unset, the same result is returned even though
16 # the ignore list has changed, causing the configure process to not
17 # terminate when the right LLVM version is not found.
18 unset(LLVM_CONFIG_EXE CACHE)
15 find_program(LLVM_CONFIG_EXE19 find_program(LLVM_CONFIG_EXE
16 NAMES llvm-config-18 llvm-config-18.0 llvm-config180 llvm-config18 llvm-config NAMES_PER_DIR20 NAMES llvm-config-18 llvm-config-18.0 llvm-config180 llvm-config18 llvm-config NAMES_PER_DIR
17 PATHS21 PATHS