diff options
| author | Misty De Meo | 2012-04-11 21:42:16 -0500 |
|---|---|---|
| committer | Misty De Meo | 2012-04-11 21:45:43 -0500 |
| commit | bf0955dc8a37456fc991859c346000466a5fd652 (patch) | |
| tree | 5f98bc96c1ec76d10784e1e4f4f151bd32628287 /Library | |
| parent | f09e0c8e1e79752df95407a28bc6f1addddf5f82 (diff) | |
| download | brew-bf0955dc8a37456fc991859c346000466a5fd652.tar.bz2 | |
Fix StandardCompilers check
* Return true if Xcode version is not in hash, not nil
* Use two-digit version numbers for 4.0, 4.2, 4.3
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/utils.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index d7e28fd31..6e1db3005 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -525,18 +525,19 @@ module MacOS extend self StandardCompilers = { "3.1.4" => {:gcc_40_build_version=>5493, :gcc_42_build_version=>5577, :llvm_build_version=>2064}, "3.2.6" => {:gcc_40_build_version=>5494, :gcc_42_build_version=>5666, :llvm_build_version=>2335, :clang_version=>"1.7", :clang_build_version=>77}, - "4.0.0" => {:gcc_40_build_version=>5494, :gcc_42_build_version=>5666, :llvm_build_version=>2335, :clang_version=>"2.0", :clang_build_version=>137}, + "4.0" => {:gcc_40_build_version=>5494, :gcc_42_build_version=>5666, :llvm_build_version=>2335, :clang_version=>"2.0", :clang_build_version=>137}, "4.0.1" => {:gcc_40_build_version=>5494, :gcc_42_build_version=>5666, :llvm_build_version=>2335, :clang_version=>"2.0", :clang_build_version=>137}, "4.0.2" => {:gcc_40_build_version=>5494, :gcc_42_build_version=>5666, :llvm_build_version=>2335, :clang_version=>"2.0", :clang_build_version=>137}, - "4.2.0" => {:llvm_build_version=>2336, :clang_version=>"3.0", :clang_build_version=>211}, - "4.3.0" => {:llvm_build_version=>2336, :clang_version=>"3.1", :clang_build_version=>318}, + "4.2" => {:llvm_build_version=>2336, :clang_version=>"3.0", :clang_build_version=>211}, + "4.3" => {:llvm_build_version=>2336, :clang_version=>"3.1", :clang_build_version=>318}, "4.3.1" => {:llvm_build_version=>2336, :clang_version=>"3.1", :clang_build_version=>318}, "4.3.2" => {:llvm_build_version=>2336, :clang_version=>"3.1", :clang_build_version=>318} } def compilers_standard? xcode = MacOS.xcode_version - return unless StandardCompilers.keys.include? xcode + # Assume compilers are okay if Xcode version not in hash + return true unless StandardCompilers.keys.include? xcode StandardCompilers[xcode].all? {|k,v| MacOS.send(k) == v} end |