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

os/mac/sdk: use OS::Mac.sdk_version.

Browse Source 
This should allow the correct SDK to be found.

Fixes https://github.com/Homebrew/brew/issues/9324
This commit is contained in:
Mike McQuaid 2020-11-27 20:18:56 +00:00
parent d7f03bc2dd
commit 016893c132
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,8 +44,8 @@ module OS
def sdk_if_applicable(v = nil) def sdk_if_applicable(v = nil)
sdk = begin sdk = begin
if v.nil? if v.blank?
sdk_for OS::Mac.version sdk_for OS::Mac.sdk_version
else else
sdk_for v sdk_for v
end end
@ -53,7 +53,7 @@ module OS
latest_sdk latest_sdk
end end
# 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.nil? && sdk.version >= OS::Mac.version) return unless v || (sdk.present? && sdk.version >= OS::Mac.sdk_version)
sdk sdk
end end
@ -76,7 +76,7 @@ module OS
Dir[File.join(sdk_prefix, "MacOSX*.sdk")].each do |sdk_path| Dir[File.join(sdk_prefix, "MacOSX*.sdk")].each do |sdk_path|
version = sdk_path[/MacOSX(\d+\.\d+)u?\.sdk$/, 1] version = sdk_path[/MacOSX(\d+\.\d+)u?\.sdk$/, 1]
paths[OS::Mac::Version.new(version)] = sdk_path unless version.nil? paths[OS::Mac::Version.new(version)] = sdk_path if version.present?
end end
paths paths