Merge pull request #81165 from edymtt/edymtt/add-builtin-float-dep-to-distributed-and-synchronization-6.2

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

Author: edymtt

stdlib/private/OSLog/CMakeLists.txt

@@ -8,6 +8,16 @@ 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))
+  # We need to make this dependency explicit because this library
+  # imports Darwin and Darwin re-exports _Builtin_float,
+  # but in most configurations we pull Darwin from the SDK,
+  # meaning we specify no Darwin dependency in the build system
+  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,17 @@ 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))
+  # We need to make this dependency explicit because this library
+  # imports Darwin and Darwin re-exports _Builtin_float,
+  # but in most configurations we pull Darwin from the SDK,
+  # meaning we specify no Darwin dependency in the build system
+  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,17 @@ 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))
+  # We need to make this dependency explicit because this library
+  # imports Darwin and Darwin re-exports _Builtin_float,
+  # but in most configurations we pull Darwin from the SDK,
+  # meaning we specify no Darwin dependency in the build system
+  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,17 @@ 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))
+  # We need to make this dependency explicit because this library
+  # imports Darwin and Darwin re-exports _Builtin_float,
+  # but in most configurations we pull Darwin from the SDK,
+  # meaning we specify no Darwin dependency in the build system
+  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,17 @@ 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))
+  # We need to make this dependency explicit because this library
+  # imports Darwin and Darwin re-exports _Builtin_float,
+  # but in most configurations we pull Darwin from the SDK,
+  # meaning we specify no Darwin dependency in the build system
+  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,17 @@ 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))
+  # We need to make this dependency explicit because this library
+  # imports Darwin and Darwin re-exports _Builtin_float,
+  # but in most configurations we pull Darwin from the SDK,
+  # meaning we specify no Darwin dependency in the build system
+  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

@@ -16,6 +16,17 @@ else()
 set(swift_distributed_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))
+  # We need to make this dependency explicit because this library
+  # imports Darwin and Darwin re-exports _Builtin_float,
+  # but in most configurations we pull Darwin from the SDK,
+  # meaning we specify no Darwin dependency in the build system
+  list(APPEND swift_distributed_darwin_dependencies _Builtin_float)
+endif()
+
 set(swift_distributed_link_libraries
   swiftCore)
 

stdlib/public/Synchronization/CMakeLists.txt

@@ -41,6 +41,17 @@ if(SWIFT_BUILD_SDK_OVERLAY)
   set(SWIFT_SYNCHRONIZATION_DARWIN_DEPENDENCIES Darwin)
 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))
+  # We need to make this dependency explicit because this library
+  # imports Darwin and Darwin re-exports _Builtin_float,
+  # but in most configurations we pull Darwin from the SDK,
+  # meaning we specify no Darwin dependency in the build system
+  list(APPEND SWIFT_SYNCHRONIZATION_DARWIN_DEPENDENCIES _Builtin_float)
+endif()
+
 set(SWIFT_SYNCHRONIZATION_DARWIN_SOURCES
   Mutex/DarwinImpl.swift
   Mutex/Mutex.swift

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

@@ -12,6 +12,17 @@ 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))
+  # We need to make this dependency explicit because this library
+  # imports Darwin and Darwin re-exports _Builtin_float,
+  # but in most configurations we pull Darwin from the SDK,
+  # meaning we specify no Darwin dependency in the build system
+  list(APPEND darwin _Builtin_float)
+endif()
+
 # Similarly, we only want the Runtime dependency if we're building
 # with the stdlib.
 set(runtime)