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

Un-break MacOS.sdk_path

Browse Source 
MacOS.sdk_path is meant to return the SDK path that matches the version
argument, so store the result in a hash.

Fixes Homebrew/homebrew#13623.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-07-27 02:38:10 -05:00
parent 8d949520ec
commit 4dde88b6d3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/macos.rb
View File

@ -92,10 +92,11 @@ module MacOS extend self
end
def sdk_path v=version
@sdk_path ||= begin
@sdk_path ||= {}
@sdk_path[v.to_s] ||= begin
path = if not Xcode.bad_xcode_select_path? and File.executable? "#{Xcode.folder}/usr/bin/make"
`#{locate('xcodebuild')} -version -sdk macosx#{v} Path 2>/dev/null`.strip
elsif File.directory? '/Developer/SDKs/MacOS#{v}.sdk'
elsif File.directory? "/Developer/SDKs/MacOS#{v}.sdk"
# the old default (or wild wild west style)
"/Developer/SDKs/MacOS#{v}.sdk"
elsif File.directory? "#{Xcode.prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX#{v}.sdk"