Skip to content

Commit cea9d5c

Browse files
authored
Merge pull request #32722 from dcci/ocarina-of-time
[CMake] Remove a redundant and potentially incorrect check.
2 parents c7cd497 + ca3d37f commit cea9d5c

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

cmake/modules/DarwinSDKs.cmake

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,6 @@ set(SUPPORTED_WATCHOS_ARCHS "armv7k")
1616
set(SUPPORTED_WATCHOS_SIMULATOR_ARCHS "i386;arm64")
1717
set(SUPPORTED_OSX_ARCHS "x86_64;arm64;arm64e")
1818

19-
# Get the SDK version from SDKSettings.
20-
execute_process(
21-
COMMAND "defaults" "read" "${CMAKE_OSX_SYSROOT}/SDKSettings.plist" "Version"
22-
OUTPUT_VARIABLE SWIFT_OSX_SDK_VERSION
23-
OUTPUT_STRIP_TRAILING_WHITESPACE)
24-
25-
# Remove the last component, if any. e.g. 10.15.26 -> 10.15
26-
string(REGEX REPLACE "\([0-9]*[.][0-9]*\)[.][0-9]*" "\\1"
27-
SWIFT_OSX_SDK_VERSION "${SWIFT_OSX_SDK_VERSION}")
28-
29-
if (${SWIFT_OSX_SDK_VERSION} STREQUAL "10.14" OR
30-
${SWIFT_OSX_SDK_VERSION} STREQUAL "10.15")
31-
set(SUPPORTED_OSX_ARCHS "x86_64")
32-
else()
33-
set(SUPPORTED_OSX_ARCHS "x86_64;arm64e")
34-
endif()
35-
3619
is_sdk_requested(OSX swift_build_osx)
3720
if(swift_build_osx)
3821
configure_sdk_darwin(

0 commit comments

Comments
 (0)