smeenai created this revision.
smeenai added reviewers: beanz, phosek, tstellar.
Herald added a subscriber: mgorny.
smeenai requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
We want installs to be executed even if binaries haven't changed, e.g.
so that we can install to multiple places. This is consistent with how
non-multi-stage install targets (e.g. the regular install-distribution
target) behave.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D99321
Files:
clang/CMakeLists.txt
Index: clang/CMakeLists.txt
===================================================================
--- clang/CMakeLists.txt
+++ clang/CMakeLists.txt
@@ -867,10 +867,23 @@
# 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
+ # "^install" to get a tighter match. CMake's installation scripts already
+ # skip up-to-date files, so there's no behavior change if you install to
the
+ # same destination multiple times.
+ if(target MATCHES "^install-")
+ set(step_always ON)
+ else()
+ set(step_always OFF)
+ endif()
+
ExternalProject_Add_Step(${NEXT_CLANG_STAGE} ${target}
COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target ${target}
COMMENT "Performing ${target} for '${NEXT_CLANG_STAGE}'"
DEPENDEES configure
+ ALWAYS ${step_always}
USES_TERMINAL 1
)
Index: clang/CMakeLists.txt
===================================================================
--- clang/CMakeLists.txt
+++ clang/CMakeLists.txt
@@ -867,10 +867,23 @@
# 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
+ # "^install" to get a tighter match. CMake's installation scripts already
+ # skip up-to-date files, so there's no behavior change if you install to the
+ # same destination multiple times.
+ if(target MATCHES "^install-")
+ set(step_always ON)
+ else()
+ set(step_always OFF)
+ endif()
+
ExternalProject_Add_Step(${NEXT_CLANG_STAGE} ${target}
COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target ${target}
COMMENT "Performing ${target} for '${NEXT_CLANG_STAGE}'"
DEPENDEES configure
+ ALWAYS ${step_always}
USES_TERMINAL 1
)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
