From 793f820b393e0a79842b99afb008d13eb1343ed8 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 25 May 2024 09:02:39 -0700 Subject: [PATCH] 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. --- cmake/Findllvm.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake index 95f1b25807..ed8acba37e 100644 --- a/cmake/Findllvm.cmake +++ b/cmake/Findllvm.cmake @@ -12,6 +12,10 @@ if(ZIG_USE_LLVM_CONFIG) set(LLVM_CONFIG_ERROR_MESSAGES "") while(1) + # If this variable is not unset, the same result is returned even though + # the ignore list has changed, causing the configure process to not + # terminate when the right LLVM version is not found. + unset(LLVM_CONFIG_EXE CACHE) find_program(LLVM_CONFIG_EXE NAMES llvm-config-18 llvm-config-18.0 llvm-config180 llvm-config18 llvm-config NAMES_PER_DIR PATHS