Skip to content

Commit 231a9d9

Browse files
committed
Add _Builtin_float dependency to Distributed and Synchronization
This will avoid errors in CI when the latter ones are scheduled before the former. Addresses rdar://149558141
1 parent 685572e commit 231a9d9

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

stdlib/public/Distributed/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@ else()
1616
set(swift_distributed_darwin_dependencies)
1717
endif()
1818

19+
if((SWIFT_BUILD_CLANG_OVERLAYS
20+
OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
21+
AND (NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT
22+
OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT))
23+
set(swift_distributed_dependencies _Builtin_float)
24+
else()
25+
set(swift_distributed_dependencies)
26+
endif()
27+
1928
set(swift_distributed_link_libraries
2029
swiftCore)
2130

@@ -30,6 +39,7 @@ add_swift_target_library(swiftDistributed ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS
3039
DistributedMetadata.swift
3140
LocalTestingDistributedActorSystem.swift
3241

42+
SWIFT_MODULE_DEPENDS ${swift_distributed_dependencies}
3343
SWIFT_MODULE_DEPENDS_IOS ${swift_distributed_darwin_dependencies}
3444
SWIFT_MODULE_DEPENDS_OSX ${swift_distributed_darwin_dependencies}
3545
SWIFT_MODULE_DEPENDS_TVOS ${swift_distributed_darwin_dependencies}

stdlib/public/Synchronization/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@ if(SWIFT_BUILD_SDK_OVERLAY)
4141
set(SWIFT_SYNCHRONIZATION_DARWIN_DEPENDENCIES Darwin)
4242
endif()
4343

44+
set(SWIFT_SYNCHRONIZATION_DEPENDENCIES)
45+
if((SWIFT_BUILD_CLANG_OVERLAYS
46+
OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
47+
AND (NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT
48+
OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT))
49+
set(SWIFT_SYNCHRONIZATION_DEPENDENCIES _Builtin_float)
50+
endif()
51+
4452
set(SWIFT_SYNCHRONIZATION_DARWIN_SOURCES
4553
Mutex/DarwinImpl.swift
4654
Mutex/Mutex.swift
@@ -104,6 +112,8 @@ add_swift_target_library(swiftSynchronization ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES
104112
SWIFT_SOURCES_DEPENDS_FREESTANDING
105113
Mutex/MutexUnavailable.swift
106114

115+
SWIFT_MODULE_DEPENDS
116+
${SWIFT_SYNCHRONIZATION_DEPENDENCIES}
107117
SWIFT_MODULE_DEPENDS_OSX
108118
${SWIFT_SYNCHRONIZATION_DARWIN_DEPENDENCIES}
109119
SWIFT_MODULE_DEPENDS_IOS

0 commit comments

Comments
 (0)