Merge pull request #30286 from drexin/wip-move-swift-source

drexin · web-flow · commit 4f4755f38edd · 2020-03-08T19:32:37.000-07:00
Move SwiftSource.cmake to stdlib
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -477,7 +477,6 @@ endif()
 include(SwiftComponents)
 include(SwiftHandleGybSources)
 include(SwiftSetIfArchBitness)
-include(SwiftSource)
 include(AddSwift)
 include(SwiftConfigureSDK)
 include(SwiftComponents)
diff --git a/cmake/modules/StandaloneOverlay.cmake b/cmake/modules/StandaloneOverlay.cmake
@@ -112,7 +112,6 @@ include(SwiftSharedCMakeConfig)
 include(AddSwift)
 include(SwiftHandleGybSources)
 include(SwiftConfigureSDK)
-include(SwiftSource)
 include(SwiftComponents)
 include(DarwinSDKs)
 
diff --git a/stdlib/cmake/modules/AddSwiftStdlib.cmake b/stdlib/cmake/modules/AddSwiftStdlib.cmake
@@ -1,5 +1,6 @@
 
 include(AddSwift)
+include(SwiftSource)
 
 # Add a universal binary target created from the output of the given
 # set of targets by running 'lipo'.
diff --git a/stdlib/cmake/modules/SwiftSource.cmake b/stdlib/cmake/modules/SwiftSource.cmake
