Merge pull request #10072 from carlocab/big-sur-sdk-path

sdk: use unversioned SDK path on Big Sur
This commit is contained in:
Mike McQuaid 2020-12-22 08:10:23 +00:00 committed by GitHub
commit b4303c23c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -91,6 +91,14 @@ module OS
paths[OS::Mac::Version.new(version)] = sdk_path if version.present?
end
# Use unversioned SDK path on Big Sur to avoid issues such as:
# https://github.com/Homebrew/homebrew-core/issues/67075
if OS::Mac.version >= :big_sur
sdk_path = File.join(sdk_prefix, "MacOSX.sdk")
version = OS::Mac.full_version
paths[version] = sdk_path if File.directory?(sdk_path)
end
paths
else
{}