[Tools] Get swiftdt actually building again.

rdar://problem/55481578

Author: mikeash

stdlib/cmake/modules/AddSwiftStdlib.cmake

@@ -2240,7 +2240,7 @@ endfunction()
 #
 #   [ARCHITECTURE architecture]
 #     Architecture to build for.
-function(_add_swift_target_executable_single name)
+function(_add_swift_target_executable_single module_name name)
   set(options)
   set(single_parameter_options
     ARCHITECTURE
@@ -2298,7 +2298,7 @@ function(_add_swift_target_executable_single name)
       SWIFTEXE_SINGLE_SOURCES SWIFTEXE_SINGLE_EXTERNAL_SOURCES ${name}
       DEPENDS
         ${SWIFTEXE_SINGLE_DEPENDS}
-      MODULE_NAME ${name}
+      MODULE_NAME ${module_name}
       SDK ${SWIFTEXE_SINGLE_SDK}
       ARCHITECTURE ${SWIFTEXE_SINGLE_ARCHITECTURE}
       COMPILE_FLAGS ${SWIFTEXE_SINGLE_COMPILE_FLAGS}
@@ -2405,6 +2405,7 @@ function(add_swift_target_executable name)
           "-${SWIFT_SDK_${sdk}_LIB_SUBDIR}"
           SWIFTEXE_TARGET_DEPENDS_with_suffix)
       _add_swift_target_executable_single(
+          ${name}
           ${VARIANT_NAME}
           ${SWIFTEXE_TARGET_SOURCES}
           DEPENDS ${SWIFTEXE_TARGET_DEPENDS_with_suffix}

tools/swiftdt/CMakeLists.txt

@@ -1,12 +1,13 @@
-add_swift_host_tool(swiftdt
+add_swift_target_executable(swiftdt
   Inspector.swift
+  InterpolationExtensions.swift
   main.swift
+  RemoteMirrorExtensions.swift
   stdio.swift
   symbolication.swift
-  SWIFT_COMPONENT tools
-  COMPILE_FLAGS -I${SWIFT_SOURCE_DIR}/include/swift/SwiftRemoteMirror
-  )
 
-add_dependencies(swiftdt swift-stdlib)
-target_link_libraries(swiftdt
-  swiftRemoteMirror.dylib)
+  COMPILE_FLAGS
+    -I${SWIFT_SOURCE_DIR}/include/swift/SwiftRemoteMirror
+  LINK_LIBRARIES
+    swiftRemoteMirror
+  )

tools/swiftdt/main.swift

@@ -1,4 +1,3 @@
-import Foundation
 import SwiftRemoteMirror