Skip to content

Commit 144ec41

Browse files
committed
[CMake] Stop requiring ${SDK}/System/Library/Frameworks/module.modulemap
Remove anachronistic check for a "blanket" module map in /System/Library/Frameworks from Darwin SDK configuration. We already extract other information from the SDK that we actually need, so check for that directly instead. Fixes rdar://problem/60084609.
1 parent b2facd0 commit 144ec41

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

cmake/modules/SwiftConfigureSDK.cmake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,9 @@ macro(configure_sdk_darwin
127127
COMMAND "xcrun" "--sdk" "${xcrun_name}" "--show-sdk-path"
128128
OUTPUT_VARIABLE SWIFT_SDK_${prefix}_PATH
129129
OUTPUT_STRIP_TRAILING_WHITESPACE)
130-
if(NOT EXISTS "${SWIFT_SDK_${prefix}_PATH}/System/Library/Frameworks/module.map")
131-
message(FATAL_ERROR "${name} SDK not found at ${SWIFT_SDK_${prefix}_PATH}.")
132-
endif()
133130
endif()
134131

135-
if(NOT EXISTS "${SWIFT_SDK_${prefix}_PATH}/System/Library/Frameworks/module.map")
132+
if(NOT EXISTS "${SWIFT_SDK_${prefix}_PATH}/SDKSettings.plist")
136133
message(FATAL_ERROR "${name} SDK not found at SWIFT_SDK_${prefix}_PATH.")
137134
endif()
138135

0 commit comments

Comments
 (0)