admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

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

Browse Source 
os/mac/sdk: parse version from SDKSettings.json
This commit is contained in:
Mike McQuaid 2020-12-24 13:09:44 +00:00 committed by GitHub
commit a2ae6f81d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/os/mac/sdk.rb
View File

@ -93,10 +93,11 @@ module OS
# 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)
sdk_path = File.join(sdk_prefix, "MacOSX.sdk")
if OS::Mac.version >= :big_sur && File.directory?(sdk_path)
sdk_settings = File.join(sdk_path, "SDKSettings.json")
version = JSON.parse(File.read(sdk_settings))["Version"] if File.exist?(sdk_settings)
paths[OS::Mac::Version.new(version)] = sdk_path if version.present?
end
paths