Skip to content

Commit

Permalink
[clang] Pass option directly to command. NFC
Browse files Browse the repository at this point in the history
This code was written back when LLVM's minimum required CMake version
was 2.8.8, and I assume ExternalProject_Add_Step didn't take this option
at that point. It does now though, so we should just use the option.
Setting the _EP_* property is entirely equivalent (and is in fact how
these commands behave internally), but that also feels like an internal
implementation detail we shouldn't be relying on.

Reviewed By: beanz

Differential Revision: https://reviews.llvm.org/D99322
  • Loading branch information
smeenai committed Mar 25, 2021
1 parent 0135bc9 commit 33930a0
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions clang/CMakeLists.txt
Expand Up @@ -864,9 +864,6 @@ if (CLANG_ENABLE_BOOTSTRAP)
set(CLANG_BOOTSTRAP_TARGETS check-llvm check-clang check-all)
endif()
foreach(target ${CLANG_BOOTSTRAP_TARGETS})
# exclude from main target
set_target_properties(${NEXT_CLANG_STAGE} PROPERTIES _EP_${target}_EXCLUDE_FROM_MAIN On)

# Install targets have side effects, so we always want to execute them.
# "install" is reserved by CMake and can't be used as a step name for
# ExternalProject_Add_Step, so we can match against "^install-" instead of
Expand All @@ -884,6 +881,7 @@ if (CLANG_ENABLE_BOOTSTRAP)
COMMENT "Performing ${target} for '${NEXT_CLANG_STAGE}'"
DEPENDEES configure
ALWAYS ${step_always}
EXCLUDE_FROM_MAIN ON
USES_TERMINAL 1
)

Expand Down

0 comments on commit 33930a0

Please sign in to comment.