[PATCH] D80770: [diagtool] Install diagtool when LLVM_INSTALL_TOOLCHAIN_ONLY is ON.

Volodymyr Sapsai via Phabricator via cfe-commits cfe-commits at lists.llvm.org
Thu May 28 17:38:28 PDT 2020


vsapsai created this revision.
vsapsai added reviewers: JDevlieghere, steven_wu.
Herald added subscribers: ributzka, dexonsmith, jkorous, mgorny.
Herald added a project: clang.

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


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D80770

Files:
  clang/tools/diagtool/CMakeLists.txt


Index: clang/tools/diagtool/CMakeLists.txt
===================================================================
--- clang/tools/diagtool/CMakeLists.txt
+++ clang/tools/diagtool/CMakeLists.txt
@@ -2,7 +2,7 @@
   Support
   )
 
-add_clang_executable(diagtool
+add_clang_tool(diagtool
   diagtool_main.cpp
   DiagTool.cpp
   DiagnosticNames.cpp
@@ -17,15 +17,3 @@
   clangBasic
   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()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D80770.267094.patch
Type: text/x-patch
Size: 666 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200529/24847436/attachment-0001.bin>


More information about the cfe-commits mailing list