Skip to content

Commit 034bfa1

Browse files
Merge pull request #82094 from ian-twilightcoder/builtin-float-embedded
[embedded][overlay] _Builtin_float and Synchronization cannot be imported in embedded Swift mode
2 parents 1d4e9d0 + 8bbee17 commit 034bfa1

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
@@ -147,6 +147,12 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
147147
add_custom_target(embedded-synchronization)
148148
add_dependencies(embedded-libraries embedded-synchronization)
149149

150+
set(SWIFT_ENABLE_REFLECTION OFF)
151+
set(SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT OFF)
152+
set(SWIFT_STDLIB_STABLE_ABI OFF)
153+
set(SWIFT_STDLIB_ENABLE_OBJC_INTEROP OFF)
154+
set(SWIFT_STDLIB_ENABLE_VECTOR_TYPES OFF)
155+
150156
foreach(entry ${EMBEDDED_STDLIB_TARGET_TRIPLES})
151157
string(REGEX REPLACE "[ \t]+" ";" list "${entry}")
152158
list(GET list 0 arch)
@@ -161,9 +167,6 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
161167
set(SWIFT_SDK_embedded_ARCH_${arch}_MODULE "${mod}")
162168
set(SWIFT_SDK_embedded_LIB_SUBDIR "embedded")
163169
set(SWIFT_SDK_embedded_ARCH_${arch}_TRIPLE "${triple}")
164-
set(SWIFT_SDK_embedded_PATH ${SWIFT_SDK_OSX_PATH})
165-
set(SWIFT_SDK_embedded_ARCH_${arch}_PATH ${SWIFT_SDK_OSX_PATH})
166-
set(SWIFT_SDK_embedded_USE_ISYSROOT TRUE)
167170
add_swift_target_library_single(
168171
embedded-synchronization-${mod}
169172
swiftSynchronization

0 commit comments

Comments
 (0)