Skip to content

Commit

Permalink
Merge pull request Homebrew#956 from DomT4/oh_no_not_this_time_of_yea…
Browse files Browse the repository at this point in the history
…r_again

Xcode 8.0 changes.
  • Loading branch information
MikeMcQuaid authored Sep 22, 2016
2 parents bbed724 + a124680 commit 889c400
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
13 changes: 4 additions & 9 deletions Library/Homebrew/extend/os/mac/diagnostic.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,10 @@ def development_tools_checks
end

def fatal_development_tools_checks
if MacOS.prerelease?
%w[
check_xcode_up_to_date
check_clt_up_to_date
]
else
%w[
]
end
%w[
check_xcode_up_to_date
check_clt_up_to_date
]
end

def check_for_unsupported_macos
Expand Down
9 changes: 6 additions & 3 deletions Library/Homebrew/os/mac/xcode.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def latest_version
when "10.8" then "5.1.1"
when "10.9" then "6.2"
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"
else
# Default to newest known version of Xcode for unreleased macOS versions.
Expand Down Expand Up @@ -193,6 +193,9 @@ def update_instructions
end

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
when "10.12" then "800.0.38"
when "10.11" then "703.0.31"
Expand All @@ -206,9 +209,9 @@ def latest_version

def outdated?
if MacOS.version >= :mavericks
version = `#{MAVERICKS_PKG_PATH}/usr/bin/clang --version`
version = Utils.popen_read("#{MAVERICKS_PKG_PATH}/usr/bin/clang --version")
else
version = `/usr/bin/clang --version`
version = Utils.popen_read("/usr/bin/clang --version")
end
version = version[/clang-(\d+\.\d+\.\d+(\.\d+)?)/, 1] || "0"
version < latest_version
Expand Down
2 changes: 1 addition & 1 deletion docs/Xcode.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Tools available for your platform:
10.8 | 5.1.1 | April 2014
10.9 | 6.2 | 6.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


Expand Down

0 comments on commit 889c400

Please sign in to comment.