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

Fix clang version detection on Xcode 4.6+

Browse Source
This commit is contained in:
Jack Nagel 2013-01-28 14:38:39 -06:00
parent 246b60573f
commit 35394ad584
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/macos.rb
View File

@ -127,14 +127,14 @@ module MacOS extend self
def clang_version def clang_version
@clang_version ||= if locate("clang") @clang_version ||= if locate("clang")
`#{locate("clang")} --version` =~ /clang version (\d\.\d)/ `#{locate("clang")} --version` =~ /(?:clang|LLVM) version (\d\.\d)/
$1 $1
end end
end end
def clang_build_version def clang_build_version
@clang_build_version ||= if locate("clang") @clang_build_version ||= if locate("clang")
`#{locate("clang")} --version` =~ %r[tags/Apple/clang-(\d{2,})] `#{locate("clang")} --version` =~ %r[clang-(\d{2,})]
$1.to_i $1.to_i
end end
end end
@ -192,7 +192,7 @@ module MacOS extend self
"4.5" => { :llvm_build => 2336, :clang => "4.1", :clang_build => 421 }, "4.5" => { :llvm_build => 2336, :clang => "4.1", :clang_build => 421 },
"4.5.1" => { :llvm_build => 2336, :clang => "4.1", :clang_build => 421 }, "4.5.1" => { :llvm_build => 2336, :clang => "4.1", :clang_build => 421 },
"4.5.2" => { :llvm_build => 2336, :clang => "4.1", :clang_build => 421 }, "4.5.2" => { :llvm_build => 2336, :clang => "4.1", :clang_build => 421 },
"4.6" => { :llvm_build => 2336, :clang => "4.1", :clang_build => 421 }, "4.6" => { :llvm_build => 2336, :clang => "4.2", :clang_build => 425 },
} }
def compilers_standard? def compilers_standard?