compilers: support gcc 5

Closes Homebrew/homebrew#39470.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
なつき 2015-05-07 01:12:24 -07:00 committed by Jack Nagel
parent 85cf16868d
commit 6181a786c0
5 changed files with 7 additions and 5 deletions

1
Library/ENV/4.3/g++-5 Symbolic link
View File

@ -0,0 +1 @@
cc

1
Library/ENV/4.3/gcc-5 Symbolic link
View File

@ -0,0 +1 @@
cc

View File

@ -1,6 +1,6 @@
module CompilerConstants module CompilerConstants
GNU_GCC_VERSIONS = 3..9 GNU_GCC_VERSIONS = %w[4.3 4.4 4.5 4.6 4.7 4.8 4.9 5]
GNU_GCC_REGEXP = /^gcc-(4\.[3-9])$/ GNU_GCC_REGEXP = /^gcc-(4\.[3-9]|5)$/
end end
class CompilerFailure class CompilerFailure
@ -107,7 +107,7 @@ class CompilerSelector
case compiler case compiler
when :gnu when :gnu
GNU_GCC_VERSIONS.reverse_each do |v| GNU_GCC_VERSIONS.reverse_each do |v|
name = "gcc-4.#{v}" name = "gcc-#{v}"
version = compiler_version(name) version = compiler_version(name)
yield Compiler.new(name, version) if version yield Compiler.new(name, version) if version
end end

View File

@ -15,7 +15,7 @@ module SharedEnvExtension
} }
COMPILERS = COMPILER_SYMBOL_MAP.values + COMPILERS = COMPILER_SYMBOL_MAP.values +
GNU_GCC_VERSIONS.map { |n| "gcc-4.#{n}" } GNU_GCC_VERSIONS.map { |n| "gcc-#{n}" }
SANITIZED_VARS = %w[ SANITIZED_VARS = %w[
CDPATH GREP_OPTIONS CLICOLOR_FORCE CDPATH GREP_OPTIONS CLICOLOR_FORCE

View File

@ -130,7 +130,7 @@ module Stdenv
alias_method :gcc_4_2, :gcc alias_method :gcc_4_2, :gcc
GNU_GCC_VERSIONS.each do |n| GNU_GCC_VERSIONS.each do |n|
define_method(:"gcc-4.#{n}") do define_method(:"gcc-#{n}") do
super() super()
set_cpu_cflags set_cpu_cflags
end end