commit c9a959334707810795f7e8c56ab6dd55ff0a359d
author Tom Stellard <tstellar@redhat.com> Thu Nov 03 15:12:50 2022 -0700
committer Tom Stellard <tstellar@redhat.com> Thu Nov 03 15:12:55 2022 -0700
tree d7c509a8d8e2d38d52235f0b1d8a20b6bfb99fc5
parent 0309081e1f4b564693dd4e4d3c7b1d700780c62b

clang/cmake: Simplify lit detection for standalone builds

Reviewed By: mgorny, phosek, Ericson2314

Differential Revision: https://reviews.llvm.org/D137224

clang/CMakeLists.txt

diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index 236e6fb..8763cc0 100644
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -93,9 +93,14 @@
       set(LLVM_UTILS_PROVIDED ON)
     endif()
 
+    # Seek installed Lit.
+    find_program(LLVM_LIT
+                 NAMES llvm-lit lit.py lit
+                 PATHS "${LLVM_MAIN_SRC_DIR}/utils/lit"
+                 DOC "Path to lit.py")
+
     if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
       # Note: path not really used, except for checking if lit was found
-      set(LLVM_LIT ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
       if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/llvm-lit)
         add_subdirectory(${LLVM_MAIN_SRC_DIR}/utils/llvm-lit utils/llvm-lit)
       endif()
@@ -112,12 +117,6 @@
           AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
         add_subdirectory(${UNITTEST_DIR} utils/unittest)
       endif()
-    else()
-      # Seek installed Lit.
-      find_program(LLVM_LIT
-                   NAMES llvm-lit lit.py lit
-                   PATHS "${LLVM_MAIN_SRC_DIR}/utils/lit"
-                   DOC "Path to lit.py")
     endif()
 
     if(LLVM_LIT)