Skip to content

Commit aa971ec

Browse files
[6.2][embedded][overlay] _Builtin_float and Synchronization cannot be imported in embedded Swift mode
The _Builtin_float and Synchronization modules are getting the SDK_NAME encoded in their embedded modules, preventing them from being used outside of macOS in embedded mode.
1 parent 4051ea2 commit aa971ec

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

stdlib/public/ClangOverlays/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ if(NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT OR NOT SWIFT_BUILD_
4040
add_custom_target(embedded-builtin_float)
4141
add_dependencies(embedded-libraries embedded-builtin_float)
4242

43+
set(SWIFT_ENABLE_REFLECTION OFF)
44+
set(SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT OFF)
45+
set(SWIFT_STDLIB_STABLE_ABI OFF)
46+
set(SWIFT_STDLIB_ENABLE_OBJC_INTEROP OFF)
47+
set(SWIFT_STDLIB_ENABLE_VECTOR_TYPES OFF)
48+
4349
foreach(entry ${EMBEDDED_STDLIB_TARGET_TRIPLES})
4450
string(REGEX REPLACE "[ \t]+" ";" list "${entry}")
4551
list(GET list 0 arch)
@@ -49,9 +55,6 @@ if(NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT OR NOT SWIFT_BUILD_
4955
set(SWIFT_SDK_embedded_ARCH_${arch}_MODULE "${mod}")
5056
set(SWIFT_SDK_embedded_LIB_SUBDIR "embedded")
5157
set(SWIFT_SDK_embedded_ARCH_${arch}_TRIPLE "${triple}")
52-
set(SWIFT_SDK_embedded_PATH ${SWIFT_SDK_OSX_PATH})
53-
set(SWIFT_SDK_embedded_ARCH_${arch}_PATH ${SWIFT_SDK_OSX_PATH})
54-
set(SWIFT_SDK_embedded_USE_ISYSROOT TRUE)
5558
add_swift_target_library_single(
5659
embedded-builtin_float-${mod}
5760
swift_Builtin_float

stdlib/public/Synchronization/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,12 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
153153
add_custom_target(embedded-synchronization)
154154
add_dependencies(embedded-libraries embedded-synchronization)
155155

156+
set(SWIFT_ENABLE_REFLECTION OFF)
157+
set(SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT OFF)
158+
set(SWIFT_STDLIB_STABLE_ABI OFF)
159+
set(SWIFT_STDLIB_ENABLE_OBJC_INTEROP OFF)
160+
set(SWIFT_STDLIB_ENABLE_VECTOR_TYPES OFF)
161+
156162
foreach(entry ${EMBEDDED_STDLIB_TARGET_TRIPLES})
157163
string(REGEX REPLACE "[ \t]+" ";" list "${entry}")
158164
list(GET list 0 arch)
@@ -167,9 +173,6 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
167173
set(SWIFT_SDK_embedded_ARCH_${arch}_MODULE "${mod}")
168174
set(SWIFT_SDK_embedded_LIB_SUBDIR "embedded")
169175
set(SWIFT_SDK_embedded_ARCH_${arch}_TRIPLE "${triple}")
170-
set(SWIFT_SDK_embedded_PATH ${SWIFT_SDK_OSX_PATH})
171-
set(SWIFT_SDK_embedded_ARCH_${arch}_PATH ${SWIFT_SDK_OSX_PATH})
172-
set(SWIFT_SDK_embedded_USE_ISYSROOT TRUE)
173176
add_swift_target_library_single(
174177
embedded-synchronization-${mod}
175178
swiftSynchronization

0 commit comments

Comments
 (0)