Merge pull request #956 from DomT4/oh_no_not_this_time_of_year_again

Xcode 8.0 changes.
This commit is contained in:
Mike McQuaid 2016-09-22 21:26:04 +01:00 committed by GitHub
commit 889c400be4
3 changed files with 11 additions and 13 deletions

View File

@ -14,15 +14,10 @@ module Homebrew
end end
def fatal_development_tools_checks def fatal_development_tools_checks
if MacOS.prerelease? %w[
%w[ check_xcode_up_to_date
check_xcode_up_to_date check_clt_up_to_date
check_clt_up_to_date ]
]
else
%w[
]
end
end end
def check_for_unsupported_macos def check_for_unsupported_macos

View File

@ -15,7 +15,7 @@ module OS
when "10.8" then "5.1.1" when "10.8" then "5.1.1"
when "10.9" then "6.2" when "10.9" then "6.2"
when "10.10" then "7.2.1" when "10.10" then "7.2.1"
when "10.11" then "7.3.1" when "10.11" then "8.0"
when "10.12" then "8.0" when "10.12" then "8.0"
else else
# Default to newest known version of Xcode for unreleased macOS versions. # Default to newest known version of Xcode for unreleased macOS versions.
@ -193,6 +193,9 @@ module OS
end end
def latest_version def latest_version
# As of Xcode 8 CLT releases are no longer in sync with Xcode releases
# on the older supported platform for that Xcode release, i.e there's no
# CLT package for 10.11 that contains the Clang version from Xcode 8.
case MacOS.version case MacOS.version
when "10.12" then "800.0.38" when "10.12" then "800.0.38"
when "10.11" then "703.0.31" when "10.11" then "703.0.31"
@ -206,9 +209,9 @@ module OS
def outdated? def outdated?
if MacOS.version >= :mavericks if MacOS.version >= :mavericks
version = `#{MAVERICKS_PKG_PATH}/usr/bin/clang --version` version = Utils.popen_read("#{MAVERICKS_PKG_PATH}/usr/bin/clang --version")
else else
version = `/usr/bin/clang --version` version = Utils.popen_read("/usr/bin/clang --version")
end end
version = version[/clang-(\d+\.\d+\.\d+(\.\d+)?)/, 1] || "0" version = version[/clang-(\d+\.\d+\.\d+(\.\d+)?)/, 1] || "0"
version < latest_version version < latest_version

View File

@ -10,7 +10,7 @@ Tools available for your platform:
10.8 | 5.1.1 | April 2014 10.8 | 5.1.1 | April 2014
10.9 | 6.2 | 6.2 10.9 | 6.2 | 6.2
10.10 | 7.2.1 | 7.2 10.10 | 7.2.1 | 7.2
10.11 | 7.3.1 | 7.3 10.11 | 8.0 | 7.3
10.12 | 8.0 | 8.0 10.12 | 8.0 | 8.0