diff options
| author | Michal Gorny <mgorny@gentoo.org> | 2016-10-01 13:15:56 +0000 |
|---|---|---|
| committer | Michal Gorny <mgorny@gentoo.org> | 2016-10-01 13:15:56 +0000 |
| commit | 45535cb1861266ad40e536dbdefd8984e186bc5f (patch) | |
| tree | 668d4494f3269e4e187fb1f13417d6e36f9ebbd4 | |
| parent | f1c575bad771f6291dfe3352a5e3b459a321105a (diff) | |
| download | bcm5719-llvm-45535cb1861266ad40e536dbdefd8984e186bc5f.tar.gz bcm5719-llvm-45535cb1861266ad40e536dbdefd8984e186bc5f.zip | |
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.
llvm-svn: 283036
| -rw-r--r-- | llvm/cmake/modules/AddLLVM.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 080503ef629..37b3b801912 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/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}) |
