diff options
| -rw-r--r-- | Library/Homebrew/compilers.rb | 9 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ENV/shared.rb | 10 |
2 files changed, 9 insertions, 10 deletions
diff --git a/Library/Homebrew/compilers.rb b/Library/Homebrew/compilers.rb index f12d9f2ff..25f09843e 100644 --- a/Library/Homebrew/compilers.rb +++ b/Library/Homebrew/compilers.rb @@ -1,6 +1,15 @@ module CompilerConstants 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]|5)$/ + COMPILER_SYMBOL_MAP = { + "gcc-4.0" => :gcc_4_0, + "gcc-4.2" => :gcc, + "llvm-gcc" => :llvm, + "clang" => :clang, + } + + COMPILERS = COMPILER_SYMBOL_MAP.values + + GNU_GCC_VERSIONS.map { |n| "gcc-#{n}" } end class CompilerFailure diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb index 01a2d6ca6..414facd4d 100644 --- a/Library/Homebrew/extend/ENV/shared.rb +++ b/Library/Homebrew/extend/ENV/shared.rb @@ -7,16 +7,6 @@ module SharedEnvExtension CC_FLAG_VARS = %w{CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS} FC_FLAG_VARS = %w{FCFLAGS FFLAGS} - COMPILER_SYMBOL_MAP = { - "gcc-4.0" => :gcc_4_0, - "gcc-4.2" => :gcc, - "llvm-gcc" => :llvm, - "clang" => :clang, - } - - COMPILERS = COMPILER_SYMBOL_MAP.values + - GNU_GCC_VERSIONS.map { |n| "gcc-#{n}" } - SANITIZED_VARS = %w[ CDPATH GREP_OPTIONS CLICOLOR_FORCE CPATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH OBJC_INCLUDE_PATH |