CMake: add explicit dependency to _Builtin_float to targets...

... that would import that through Darwin.

Amend my previous change to Differentiation and Distributed in this
sense.

Addresses rdar://150400049

Author: edymtt

stdlib/private/OSLog/CMakeLists.txt

@@ -8,6 +8,12 @@ endif()
 if (SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING)
   list(APPEND swift_oslog_darwin_dependencies "_StringProcessing")
 endif()
+if((SWIFT_BUILD_CLANG_OVERLAYS
+    OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
+   AND (NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT
+        OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT))
+  list(APPEND swift_oslog_darwin_dependencies _Builtin_float)
+endif()
 
 add_swift_target_library(swiftOSLogTestHelper
   IS_SDK_OVERLAY

stdlib/private/StdlibUnittest/CMakeLists.txt

@@ -4,6 +4,13 @@ else()
 set(swift_stdlib_unittest_darwin_dependencies)
 endif()
 
+if((SWIFT_BUILD_CLANG_OVERLAYS
+    OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
+   AND (NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT
+        OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT))
+  list(APPEND swift_stdlib_unittest_darwin_dependencies _Builtin_float)
+endif()
+
 set(swift_stdlib_unittest_compile_flags
   "-Xfrontend" "-disable-objc-attr-requires-foundation-module")
 if (SWIFT_RUNTIME_ENABLE_LEAK_CHECKER)

stdlib/private/SwiftPrivate/CMakeLists.txt

@@ -8,6 +8,13 @@ else()
 set(swift_swiftprivate_darwin_dependencies)
 endif()
 
+if((SWIFT_BUILD_CLANG_OVERLAYS
+    OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
+   AND (NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT
+        OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT))
+  list(APPEND swift_swiftprivate_darwin_dependencies _Builtin_float)
+endif()
+
 add_swift_target_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.

stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt

@@ -20,6 +20,13 @@ else()
 set(swift_private_libc_extras_darwin_dependencies)
 endif()
 
+if((SWIFT_BUILD_CLANG_OVERLAYS
+    OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
+   AND (NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT
+        OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT))
+  list(APPEND swift_private_libc_extras_darwin_dependencies _Builtin_float)
+endif()
+
 add_swift_target_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.

stdlib/private/SwiftPrivateThreadExtras/CMakeLists.txt

@@ -4,6 +4,13 @@ else()
 set(swift_private_thread_extras_darwin_dependencies)
 endif()
 
+if((SWIFT_BUILD_CLANG_OVERLAYS
+    OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
+   AND (NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT
+        OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT))
+  list(APPEND swift_private_thread_extras_darwin_dependencies _Builtin_float)
+endif()
+
 add_swift_target_library(swiftSwiftPrivateThreadExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.

stdlib/private/SwiftReflectionTest/CMakeLists.txt

@@ -4,6 +4,13 @@ else()
 set(swift_reflection_test_darwin_dependencies)
 endif()
 
+if((SWIFT_BUILD_CLANG_OVERLAYS
+    OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
+   AND (NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT
+        OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT))
+  list(APPEND swift_reflection_test_darwin_dependencies _Builtin_float)
+endif()
+
 if (SWIFT_INCLUDE_TESTS AND SWIFT_BUILD_DYNAMIC_STDLIB)
   add_swift_target_library(swiftSwiftReflectionTest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
     SwiftReflectionTest.swift

stdlib/public/Distributed/CMakeLists.txt

@@ -20,9 +20,7 @@ if((SWIFT_BUILD_CLANG_OVERLAYS
     OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
    AND (NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT
         OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT))
-set(swift_distributed_dependencies _Builtin_float)
-else()
-set(swift_distributed_dependencies)
+list(APPEND swift_distributed_darwin_dependencies _Builtin_float)
 endif()
 
 set(swift_distributed_link_libraries
@@ -39,7 +37,6 @@ add_swift_target_library(swiftDistributed ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS
   DistributedMetadata.swift
   LocalTestingDistributedActorSystem.swift
 
-  SWIFT_MODULE_DEPENDS ${swift_distributed_dependencies}
   SWIFT_MODULE_DEPENDS_IOS ${swift_distributed_darwin_dependencies}
   SWIFT_MODULE_DEPENDS_OSX ${swift_distributed_darwin_dependencies}
   SWIFT_MODULE_DEPENDS_TVOS ${swift_distributed_darwin_dependencies}

stdlib/public/Synchronization/CMakeLists.txt

@@ -41,12 +41,11 @@ if(SWIFT_BUILD_SDK_OVERLAY)
   set(SWIFT_SYNCHRONIZATION_DARWIN_DEPENDENCIES Darwin)
 endif()
 
-set(SWIFT_SYNCHRONIZATION_DEPENDENCIES)
 if((SWIFT_BUILD_CLANG_OVERLAYS
     OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
    AND (NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT
         OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT))
-  set(SWIFT_SYNCHRONIZATION_DEPENDENCIES _Builtin_float)
+  list(APPEND SWIFT_SYNCHRONIZATION_DARWIN_DEPENDENCIES _Builtin_float)
 endif()
 
 set(SWIFT_SYNCHRONIZATION_DARWIN_SOURCES
@@ -112,8 +111,6 @@ add_swift_target_library(swiftSynchronization ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES
   SWIFT_SOURCES_DEPENDS_FREESTANDING
     Mutex/MutexUnavailable.swift
 
-  SWIFT_MODULE_DEPENDS
-    ${SWIFT_SYNCHRONIZATION_DEPENDENCIES}
   SWIFT_MODULE_DEPENDS_OSX
     ${SWIFT_SYNCHRONIZATION_DARWIN_DEPENDENCIES}
   SWIFT_MODULE_DEPENDS_IOS

stdlib/public/libexec/swift-backtrace/CMakeLists.txt

@@ -12,6 +12,13 @@ if(SWIFT_BUILD_SDK_OVERLAY)
   set(musl Musl)
 endif()
 
+if((SWIFT_BUILD_CLANG_OVERLAYS
+    OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
+   AND (NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT
+        OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT))
+  list(APPEND darwin _Builtin_float)
+endif()
+
 # Similarly, we only want the Runtime dependency if we're building
 # with the stdlib.
 set(runtime)