diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb index 3547567ba7..27c92bbf7c 100644 --- a/Library/Homebrew/os/mac.rb +++ b/Library/Homebrew/os/mac.rb @@ -81,17 +81,8 @@ module OS # are available) is returned. # 3. If no SDKs are available, nil is returned. # - # If no specific SDK is requested: - # - # 1. For Xcode >= 7, the latest SDK is returned even if the latest SDK is - # named after a newer OS version than the running OS. The - # `MACOSX_DEPLOYMENT_TARGET` must be set to the OS for which you're - # actually building (usually the running OS version). - # - https://github.com/Homebrew/legacy-homebrew/pull/50355 - # - https://developer.apple.com/library/ios/documentation/DeveloperTools/Conceptual/WhatsNewXcode/Articles/Introduction.html#//apple_ref/doc/uid/TP40004626 - # Section "About SDKs and Simulator" - # 2. For Xcode < 7, proceed as if the SDK for the running OS version had - # specifically been requested according to the rules above. + # If no specific SDK is requested, the SDK matching the OS version is returned, + # if available. Otherwise, the latest SDK is returned. def sdk(v = nil) @locator ||= if Xcode.installed? diff --git a/Library/Homebrew/os/mac/sdk.rb b/Library/Homebrew/os/mac/sdk.rb index 1fa1356f8d..a3a8dcf83d 100644 --- a/Library/Homebrew/os/mac/sdk.rb +++ b/Library/Homebrew/os/mac/sdk.rb @@ -33,7 +33,7 @@ module OS def sdk_if_applicable(v = nil) sdk = begin if v.nil? - (source_version.to_i >= 7) ? latest_sdk : sdk_for(OS::Mac.version) + sdk_for OS::Mac.version else sdk_for v end