From: Michal Gorny <mgorny@gentoo.org>
Date: Sat, 1 Oct 2016 13:15:56 +0000 (+0000)
Subject: Revert r283029 - [cmake] Make LIT_COMMAND configurable and improve fallback support
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4f54510a1cb9b91f515e7f476b1b2d35e8dc6e5;p=llvm

Revert r283029 - [cmake] Make LIT_COMMAND configurable and improve fallback support

Revert the change in r283029 (and the fixup in r283033) due to buildbot
breakage. The fixup is ineffective for the bots that do not force clean
build since the wrong value is already cached in CMakeCache.txt.

Reverting it should result in the cache variable being removed
and therefore it should be possible to re-introduce it after all
buildbots build this revision.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@283036 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
index 080503ef629..37b3b801912 100644
--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
@@ -1083,11 +1083,10 @@ function(add_lit_target target comment)
   if (NOT CMAKE_CFG_INTDIR STREQUAL ".")
     list(APPEND LIT_ARGS --param build_mode=${CMAKE_CFG_INTDIR})
   endif ()
-  if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
-    set (LIT_COMMAND "${PYTHON_EXECUTABLE};${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py"
-         CACHE STRING "Command used to spawn llvm-lit")
+  if (LLVM_MAIN_SRC_DIR)
+    set (LIT_COMMAND ${PYTHON_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
   else()
-    find_program(LIT_COMMAND NAMES llvm-lit lit.py lit)
+    find_program(LIT_COMMAND llvm-lit)
   endif ()
   list(APPEND LIT_COMMAND ${LIT_ARGS})
   foreach(param ${ARG_PARAMS})