Symlink 'swift' and 'swiftc' to 'swift-driver', when available

Author: artemcm

tools/driver/CMakeLists.txt

@@ -77,15 +77,31 @@ add_swift_parser_link_libraries(swift-frontend)
 # to ensure that `swiftc` forwards to the standalone driver when invoked.
 swift_create_early_driver_copies(swift-frontend)
 
-swift_create_post_build_symlink(swift-frontend
-  SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}"
-  DESTINATION "swift${CMAKE_EXECUTABLE_SUFFIX}"
-  WORKING_DIRECTORY "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
+# If a `swift-driver` executable adjacent to the `swift-frontend` executable exists
+# then the `swift` and `swiftc` symlinks should point to it by-default
+if(EXISTS "${SWIFT_RUNTIME_OUTPUT_INTDIR}/swift-driver" AND EXISTS "${SWIFT_RUNTIME_OUTPUT_INTDIR}/swift-help")
+  message(STATUS "Pointing 'swift' and 'swiftc' symlinks at 'swift-driver'.")
+  swift_create_post_build_symlink(swift-frontend
+    SOURCE "swift-driver${CMAKE_EXECUTABLE_SUFFIX}"
+    DESTINATION "swift${CMAKE_EXECUTABLE_SUFFIX}"
+    WORKING_DIRECTORY "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
+
+  swift_create_post_build_symlink(swift-frontend
+    SOURCE "swift-driver${CMAKE_EXECUTABLE_SUFFIX}"
+    DESTINATION "swiftc${CMAKE_EXECUTABLE_SUFFIX}"
+    WORKING_DIRECTORY "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
+else()
+  message(STATUS "Pointing 'swift' and 'swiftc' symlinks at 'swift-frontend' - no early SwiftDriver build found.")
+  swift_create_post_build_symlink(swift-frontend
+    SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}"
+    DESTINATION "swift${CMAKE_EXECUTABLE_SUFFIX}"
+    WORKING_DIRECTORY "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
 
-swift_create_post_build_symlink(swift-frontend
-  SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}"
-  DESTINATION "swiftc${CMAKE_EXECUTABLE_SUFFIX}"
-  WORKING_DIRECTORY "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
+  swift_create_post_build_symlink(swift-frontend
+    SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}"
+    DESTINATION "swiftc${CMAKE_EXECUTABLE_SUFFIX}"
+    WORKING_DIRECTORY "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
+endif()
 
 swift_create_post_build_symlink(swift-frontend
   SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}"