Merge pull request #3335 from JCount/xcode-9.0.1

xcode: update to Xcode 9.0.1 on 10.12 and 10.13
This commit is contained in:
Mike McQuaid 2017-10-20 18:11:32 +01:00 committed by GitHub
commit 6fe7c5fc95
3 changed files with 10 additions and 6 deletions

View File

@ -201,6 +201,7 @@ module OS
"8.3.2" => { clang: "8.1", clang_build: 802 }, "8.3.2" => { clang: "8.1", clang_build: 802 },
"8.3.3" => { clang: "8.1", clang_build: 802 }, "8.3.3" => { clang: "8.1", clang_build: 802 },
"9.0" => { clang: "9.0", clang_build: 900 }, "9.0" => { clang: "9.0", clang_build: 900 },
"9.0.1" => { clang: "9.0", clang_build: 900 },
}.freeze }.freeze
def compilers_standard? def compilers_standard?

View File

@ -17,13 +17,13 @@ module OS
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 "8.2.1" when "10.11" then "8.2.1"
when "10.12" then "8.3.3" when "10.12" then "9.0.1"
when "10.13" then "9.0" when "10.13" then "9.0.1"
else else
raise "macOS '#{MacOS.version}' is invalid" unless OS::Mac.prerelease? raise "macOS '#{MacOS.version}' is invalid" unless OS::Mac.prerelease?
# Default to newest known version of Xcode for unreleased macOS versions. # Default to newest known version of Xcode for unreleased macOS versions.
"9.0" "9.0.1"
end end
end end
@ -216,8 +216,8 @@ module OS
# on the older supported platform for that Xcode release, i.e there's no # 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. # CLT package for 10.11 that contains the Clang version from Xcode 8.
case MacOS.version case MacOS.version
when "10.13" then "900.0.37" when "10.13" then "900.0.38"
when "10.12" then "802.0.42" when "10.12" then "900.0.38"
when "10.11" then "800.0.42.1" when "10.11" then "800.0.42.1"
when "10.10" then "700.1.81" when "10.10" then "700.1.81"
when "10.9" then "600.0.57" when "10.9" then "600.0.57"

View File

@ -12,7 +12,8 @@ Tools available for your platform:
| 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 | 8.2.1 | 8.2 | | 10.11 | 8.2.1 | 8.2 |
| 10.12 | 8.3.3 | 8.3 | | 10.12 | 9.0.1 | 9.0.1 |
| 10.13 | 9.0.1 | 9.0.1 |
## Compiler version database ## Compiler version database
@ -73,6 +74,8 @@ Tools available for your platform:
| 8.3.1 | — | — | — | — | 8.1 (802.0.41) | — | | 8.3.1 | — | — | — | — | 8.1 (802.0.41) | — |
| 8.3.2 | — | — | — | — | 8.1 (802.0.42) | — | | 8.3.2 | — | — | — | — | 8.1 (802.0.42) | — |
| 8.3.3 | — | — | — | — | 8.1 (802.0.42) | — | | 8.3.3 | — | — | — | — | 8.1 (802.0.42) | — |
| 9.0.0 | — | — | — | — | 9.0 (900.0.37) | — |
| 9.0.1 | — | — | — | — | 9.0 (900.0.38) | — |
## References to Xcode and compiler versions in code ## References to Xcode and compiler versions in code
When a new Xcode release is made, the following things need to be When a new Xcode release is made, the following things need to be