Skip to content

Commit 46173d6

Browse files
authored
[5.8 CMake] Assume watchOS and watchSimulator SDKs support 32 bit (#63474)
Update to match SDKSettings.json in watchOS 9.0 Addresses rdar://104967031 (cherry picked from commit 6b2809a)
1 parent 041d9de commit 46173d6

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

cmake/modules/SwiftConfigureSDK.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,14 @@ function(remove_sdk_unsupported_archs name os sdk_path architectures_var)
8484
# 32-bit iOS simulator is not listed explicitly in SDK settings.
8585
message(STATUS "Assuming ${name} SDK at ${sdk_path} supports architecture ${arch}")
8686
list(APPEND architectures ${arch})
87+
elseif(arch STREQUAL "armv7k" AND os STREQUAL "watchos")
88+
# 32-bit watchOS is not listed explicitly in SDK settings.
89+
message(STATUS "Assuming ${name} SDK at ${sdk_path} supports architecture ${arch}")
90+
list(APPEND architectures ${arch})
91+
elseif(arch STREQUAL "i386" AND os STREQUAL "watchsimulator")
92+
# 32-bit watchOS simulator is not listed explicitly in SDK settings.
93+
message(STATUS "Assuming ${name} SDK at ${sdk_path} supports architecture ${arch}")
94+
list(APPEND architectures ${arch})
8795
else()
8896
message(STATUS "${name} SDK at ${sdk_path} does not support architecture ${arch}")
8997
endif()

0 commit comments

Comments
 (0)