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

SDK: minor readability tweaks

Browse Source
This commit is contained in:
Misty De Meo 2018-07-27 15:44:22 -07:00
parent 5765dac86c
commit b66f2b207e
No known key found for this signature in database
GPG Key ID: 76CF846A2F674B2C
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,17 +29,18 @@ module OS
end end
def sdk_if_applicable(v = nil) def sdk_if_applicable(v = nil)
begin sdk = begin
sdk = if v.nil? if v.nil?
(source_version.to_i >= 7) ? latest_sdk : sdk_for(OS::Mac.version) (source_version.to_i >= 7) ? latest_sdk : sdk_for(OS::Mac.version)
else else
sdk_for v sdk_for v
end end
rescue BaseSDKLocator::NoSDKError rescue BaseSDKLocator::NoSDKError
sdk = 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
sdk if v || (!sdk.nil? && sdk.version >= OS::Mac.version) return unless v || (!sdk.nil? && sdk.version >= OS::Mac.version)
sdk
end end
private private
@ -85,7 +86,8 @@ module OS
# Xcode < 4.3 style # Xcode < 4.3 style
sdk_prefix = "/Developer/SDKs" unless File.directory? sdk_prefix sdk_prefix = "/Developer/SDKs" unless File.directory? sdk_prefix
# Finally query Xcode itself (this is slow, so check it last) # Finally query Xcode itself (this is slow, so check it last)
sdk_prefix = File.join(Utils.popen_read(DevelopmentTools.locate("xcrun"), "--show-sdk-platform-path").chomp, "Developer", "SDKs") unless File.directory? sdk_prefix sdk_platform_path = Utils.popen_read(DevelopmentTools.locate("xcrun"), "--show-sdk-platform-path").chomp
sdk_prefix = File.join(sdk_platform_path, "Developer", "SDKs") unless File.directory? sdk_prefix
sdk_prefix sdk_prefix
end end