This is an archive of the discontinued LLVM Phabricator instance.

Differential D35024

Remove obsolete "unset" in CMake configuration
ClosedPublic

Authored by george.karpenkov on Jul 5 2017, 10:59 AM.

Details

Reviewers
beanz
mgorny
Commits
rGfd7b1c0a56c0: [cmake] Remove obsolete unset in CMake.
rL307569: [cmake] Remove obsolete unset in CMake.

Diff Detail

Event Timeline

george.karpenkov created this revision.Jul 5 2017, 10:59 AM
beanz accepted this revision.Jul 10 2017, 8:16 AM

LGTM! Thanks for the cleanup!

This revision is now accepted and ready to land.Jul 10 2017, 8:16 AM
Closed by commit rL307569: [cmake] Remove obsolete unset in CMake. (authored by george.karpenkov). · Explain WhyJul 10 2017, 11:58 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cmake/
modules/
5 lines

Diff 105308

cmake/modules/AddLLVM.cmake

Show First 20 Lines • Show All 991 Lines • ▼ Show 20 Lines
function(add_lit_target target comment) function(add_lit_target target comment)
cmake_parse_arguments(ARG "" "" "PARAMS;DEPENDS;ARGS" ${ARGN}) cmake_parse_arguments(ARG "" "" "PARAMS;DEPENDS;ARGS" ${ARGN})
set(LIT_ARGS "${ARG_ARGS} ${LLVM_LIT_ARGS}") set(LIT_ARGS "${ARG_ARGS} ${LLVM_LIT_ARGS}")
separate_arguments(LIT_ARGS) separate_arguments(LIT_ARGS)
if (NOT CMAKE_CFG_INTDIR STREQUAL ".") if (NOT CMAKE_CFG_INTDIR STREQUAL ".")
list(APPEND LIT_ARGS --param build_mode=${CMAKE_CFG_INTDIR}) list(APPEND LIT_ARGS --param build_mode=${CMAKE_CFG_INTDIR})
endif () endif ()
if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
# reset cache after erraneous r283029
# TODO: remove this once all buildbots run
if (LIT_COMMAND STREQUAL "${PYTHON_EXECUTABLE} ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py")
unset(LIT_COMMAND CACHE)
endif()
set (LIT_COMMAND "${PYTHON_EXECUTABLE};${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") CACHE STRING "Command used to spawn llvm-lit")
else() else()
find_program(LIT_COMMAND NAMES llvm-lit lit.py lit) find_program(LIT_COMMAND NAMES llvm-lit lit.py lit)
endif () endif ()
list(APPEND LIT_COMMAND ${LIT_ARGS}) list(APPEND LIT_COMMAND ${LIT_ARGS})
foreach(param ${ARG_PARAMS}) foreach(param ${ARG_PARAMS})
list(APPEND LIT_COMMAND --param ${param}) list(APPEND LIT_COMMAND --param ${param})
▲ Show 20 Lines • Show All 306 Lines • Show Last 20 Lines