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

os/mac/sdk: refactor for readability.

Browse Source
This commit is contained in:
Mike McQuaid 2020-11-30 12:58:38 +00:00
parent fec6fc4b4f
commit a70d891122
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,8 @@ module OS
rescue NoSDKError rescue NoSDKError
latest_sdk latest_sdk
end end
return if sdk.blank?
# Accept an SDK for another OS version if it shares a major version # Accept an SDK for another OS version if it shares a major version
# with the current OS - for example, the 11.0 SDK on 11.1, # with the current OS - for example, the 11.0 SDK on 11.1,
# or vice versa. # or vice versa.
@ -59,11 +61,11 @@ module OS
# or greater, given the way the versioning has changed. # or greater, given the way the versioning has changed.
# This shortcuts the below check, since we *do* accept an older version # This shortcuts the below check, since we *do* accept an older version
# on macOS 11 or greater if the major version matches. # on macOS 11 or greater if the major version matches.
return sdk if sdk.present? && OS::Mac.version >= :big_sur && sdk.version.major == OS::Mac.version.major return sdk if OS::Mac.version >= :big_sur && sdk.version.major == OS::Mac.version.major
# On OSs lower than 11, or where the major versions don't match, # On OSs lower than 11, or where the major versions don't match,
# only return an SDK older than the OS version if it was specifically requested # only return an SDK older than the OS version if it was specifically requested
return unless v || (sdk.present? && sdk.version >= OS::Mac.sdk_version) return if v.blank? && sdk.version < OS::Mac.version
sdk sdk
end end