This is an archive of the discontinued LLVM Phabricator instance.

Differential D80770

[diagtool] Install diagtool when LLVM_INSTALL_TOOLCHAIN_ONLY is ON.
ClosedPublic

Authored by vsapsai on May 28 2020, 5:18 PM.

Details

Reviewers
JDevlieghere
steven_wu
Commits
rG03559c684a9b: [diagtool] Install diagtool when LLVM_INSTALL_TOOLCHAIN_ONLY is ON.
Summary

Not sure about other platforms but install-xcode-toolchain was already
including diagtool in the toolchain. This change makes it possible to
install diagtool during Apple's 2-stage build.

Instead of dropping if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) conditional
I've switched to add_clang_tool which handles install targets. Also a
few other clang tools like clang-format, clang-scan-deps are using this
macro, so it is good to be consistent.

rdar://problem/15386909

Diff Detail

Event Timeline

vsapsai created this revision.May 28 2020, 5:18 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 28 2020, 5:18 PM
Herald added subscribers: ributzka, dexonsmith, jkorous, mgorny. · View Herald Transcript
Harbormaster failed remote builds in B58357: Diff 267094!May 28 2020, 6:11 PM
JDevlieghere accepted this revision.May 28 2020, 7:57 PM

Thanks, Volodymyr!

This revision is now accepted and ready to land.May 28 2020, 7:57 PM
Closed by commit rG03559c684a9b: [diagtool] Install diagtool when LLVM_INSTALL_TOOLCHAIN_ONLY is ON. (authored by vsapsai). · Explain WhyMay 29 2020, 4:26 PM
This revision was automatically updated to reflect the committed changes.
vsapsai added a comment.May 29 2020, 4:26 PM

Thanks for the review, Jonas!

Revision Contents

PathSize
clang/
tools/
diagtool/
14 lines

Diff 267408

clang/tools/diagtool/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
Support Support
) )
add_clang_executable(diagtool add_clang_tool(diagtool
diagtool_main.cpp diagtool_main.cpp
DiagTool.cpp DiagTool.cpp
DiagnosticNames.cpp DiagnosticNames.cpp
FindDiagnosticID.cpp FindDiagnosticID.cpp
ListWarnings.cpp ListWarnings.cpp
ShowEnabledWarnings.cpp ShowEnabledWarnings.cpp
TreeView.cpp TreeView.cpp
) )
clang_target_link_libraries(diagtool clang_target_link_libraries(diagtool
PRIVATE PRIVATE
clangBasic clangBasic
clangFrontend clangFrontend
) )
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
install(TARGETS diagtool
COMPONENT diagtool
RUNTIME DESTINATION bin)
if (NOT LLVM_ENABLE_IDE)
add_llvm_install_targets(install-diagtool
DEPENDS diagtool
COMPONENT diagtool)
endif()
endif()