Merge pull request swiftlang#10337 from CodaFi/winner-of-the-tool-raffle

[Shepherd] build: create and use a wrapper for add_llvm_tool_symlink
whylovejp · Jun 17, 2017 · 6607ff7 · 6607ff7
2 parents 29f080f + 3c4c910
commit 6607ff7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
@@ -2124,3 +2124,8 @@ function(add_swift_host_tool executable)
     endif()
   endif()
 endfunction()
+
+macro(add_swift_tool_symlink name dest component)
+  add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE)
+  llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE COMPONENT ${component})
+endmacro()
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
@@ -31,6 +31,10 @@ swift_create_post_build_symlink(swift
   DESTINATION "swift-autolink-extract${CMAKE_EXECUTABLE_SUFFIX}"
   WORKING_DIRECTORY "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
 
+add_swift_tool_symlink(swiftc swift compiler)
+add_swift_tool_symlink(swift-autolink-extract swift autolink-driver)
+add_swift_tool_symlink(swift-format swift editor-integration)
+
 # If building as part of clang, make sure the headers are installed.
 if(NOT SWIFT_BUILT_STANDALONE)
   add_dependencies(swift clang-headers)