diff options
Diffstat (limited to 'Library/Homebrew/os')
| -rw-r--r-- | Library/Homebrew/os/mac.rb | 36 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/xcode.rb | 18 |
2 files changed, 19 insertions, 35 deletions
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb index 5d2447c8d..9916c3b3f 100644 --- a/Library/Homebrew/os/mac.rb +++ b/Library/Homebrew/os/mac.rb @@ -162,24 +162,24 @@ module OS "2.0" => { :gcc_40_build => 4061 }, "2.5" => { :gcc_40_build => 5370 }, "3.1.4" => { :gcc_40_build => 5493, :gcc_42_build => 5577 }, - "3.2.6" => { :gcc_40_build => 5494, :gcc_42_build => 5666, :llvm_build => 2335, :clang => "1.7", :clang_build => 77 }, - "4.0" => { :gcc_40_build => 5494, :gcc_42_build => 5666, :llvm_build => 2335, :clang => "2.0", :clang_build => 137 }, - "4.0.1" => { :gcc_40_build => 5494, :gcc_42_build => 5666, :llvm_build => 2335, :clang => "2.0", :clang_build => 137 }, - "4.0.2" => { :gcc_40_build => 5494, :gcc_42_build => 5666, :llvm_build => 2335, :clang => "2.0", :clang_build => 137 }, - "4.2" => { :llvm_build => 2336, :clang => "3.0", :clang_build => 211 }, - "4.3" => { :llvm_build => 2336, :clang => "3.1", :clang_build => 318 }, - "4.3.1" => { :llvm_build => 2336, :clang => "3.1", :clang_build => 318 }, - "4.3.2" => { :llvm_build => 2336, :clang => "3.1", :clang_build => 318 }, - "4.3.3" => { :llvm_build => 2336, :clang => "3.1", :clang_build => 318 }, - "4.4" => { :llvm_build => 2336, :clang => "4.0", :clang_build => 421 }, - "4.4.1" => { :llvm_build => 2336, :clang => "4.0", :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.2" => { :llvm_build => 2336, :clang => "4.1", :clang_build => 421 }, - "4.6" => { :llvm_build => 2336, :clang => "4.2", :clang_build => 425 }, - "4.6.1" => { :llvm_build => 2336, :clang => "4.2", :clang_build => 425 }, - "4.6.2" => { :llvm_build => 2336, :clang => "4.2", :clang_build => 425 }, - "4.6.3" => { :llvm_build => 2336, :clang => "4.2", :clang_build => 425 }, + "3.2.6" => { :gcc_40_build => 5494, :gcc_42_build => 5666, :clang => "1.7", :clang_build => 77 }, + "4.0" => { :gcc_40_build => 5494, :gcc_42_build => 5666, :clang => "2.0", :clang_build => 137 }, + "4.0.1" => { :gcc_40_build => 5494, :gcc_42_build => 5666, :clang => "2.0", :clang_build => 137 }, + "4.0.2" => { :gcc_40_build => 5494, :gcc_42_build => 5666, :clang => "2.0", :clang_build => 137 }, + "4.2" => { :clang => "3.0", :clang_build => 211 }, + "4.3" => { :clang => "3.1", :clang_build => 318 }, + "4.3.1" => { :clang => "3.1", :clang_build => 318 }, + "4.3.2" => { :clang => "3.1", :clang_build => 318 }, + "4.3.3" => { :clang => "3.1", :clang_build => 318 }, + "4.4" => { :clang => "4.0", :clang_build => 421 }, + "4.4.1" => { :clang => "4.0", :clang_build => 421 }, + "4.5" => { :clang => "4.1", :clang_build => 421 }, + "4.5.1" => { :clang => "4.1", :clang_build => 421 }, + "4.5.2" => { :clang => "4.1", :clang_build => 421 }, + "4.6" => { :clang => "4.2", :clang_build => 425 }, + "4.6.1" => { :clang => "4.2", :clang_build => 425 }, + "4.6.2" => { :clang => "4.2", :clang_build => 425 }, + "4.6.3" => { :clang => "4.2", :clang_build => 425 }, "5.0" => { :clang => "5.0", :clang_build => 500 }, "5.0.1" => { :clang => "5.0", :clang_build => 500 }, "5.0.2" => { :clang => "5.0", :clang_build => 500 }, diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 780082389..c5b6ccbfa 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -105,22 +105,7 @@ module OS # Xcode.version would always be non-nil. This is deprecated, and will # be removed in a future version. To remain compatible, guard usage of # Xcode.version with an Xcode.installed? check. - case DevelopmentTools.llvm_build_version.to_i - when 1..2063 then "3.1.0" - when 2064..2065 then "3.1.4" - when 2066..2325 - # we have no data for this range so we are guessing - "3.2.0" - when 2326 - # also applies to "3.2.3" - "3.2.4" - when 2327..2333 then "3.2.5" - when 2335 - # this build number applies to 3.2.6, 4.0 and 4.1 - # https://github.com/Homebrew/brew/blob/master/share/doc/homebrew/Xcode.md - "4.0" - else - case (DevelopmentTools.clang_version.to_f * 10).to_i + case (DevelopmentTools.clang_version.to_f * 10).to_i when 0 then "dunno" when 1..14 then "3.2.2" when 15 then "3.2.4" @@ -139,7 +124,6 @@ module OS when 70 then "7.0" when 73 then "7.3" else "7.3" - end end end |