From f6a0d9cadfcc62637c079c09ea40ef2c2a09fb3d Mon Sep 17 00:00:00 2001
From: Dominyk Tiller
Date: Wed, 10 Sep 2014 02:44:36 +0100
Subject: Prefer Xcode 6.1 on 10.10

More Yosemite changes. Within two weeks or so, Xcode should be made
available on the App Store, at which point 10.9 will need to go from
“5.1.1” to “6.0” but whilst Yosemite is in Beta *everyone* should be
using the Xcode Beta builds according to Apple, so Yosemite should be
on 6.1 for the foreseeable, even when Apple releases Xcode 6.0 to 10.9
& below. 6.1 is still using the same Clang version number at this point.

Closes #32201.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Homebrew/os/mac.rb       | 1 +
 Library/Homebrew/os/mac/xcode.rb | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index 229071b21..8d9d4178f 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -207,6 +207,7 @@ module OS
       "5.1"   => { :clang => "5.1", :clang_build => 503 },
       "5.1.1" => { :clang => "5.1", :clang_build => 503 },
       "6.0"   => { :clang => "6.0", :clang_build => 600 },
+      "6.1"   => { :clang => "6.0", :clang_build => 600 },
     }
 
     def compilers_standard?
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index 338fa1f43..a29192fd2 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -14,11 +14,11 @@ module OS
         when "10.7"  then "4.6.3"
         when "10.8"  then "5.1.1"
         when "10.9"  then "5.1.1"
-        when "10.10" then "6.0"
+        when "10.10" then "6.1"
         else
           # Default to newest known version of Xcode for unreleased OSX versions.
           if MacOS.version > "10.10"
-            "6.0"
+            "6.1"
           else
             raise "Mac OS X '#{MacOS.version}' is invalid"
           end
-- 
cgit v1.2.3