admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

HOMEBREW_CC: Remove COMPILER_ALIASES

Browse Source 
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Shaun Jackman 2014-06-03 09:43:06 +02:00 committed by Jack Nagel
parent 0133afe6f8
commit 6e56009217
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/extend/ENV/shared.rb
View File

@ -8,7 +8,6 @@ module SharedEnvExtension
GNU_GCC_VERSIONS = (3..9) GNU_GCC_VERSIONS = (3..9)
GNU_GCC_REGEXP = /gcc-(4\.[3-9])/ GNU_GCC_REGEXP = /gcc-(4\.[3-9])/
COMPILER_ALIASES = {'gcc' => 'gcc-4.2', 'llvm' => 'llvm-gcc'}
COMPILER_SYMBOL_MAP = { 'gcc-4.0' => :gcc_4_0, COMPILER_SYMBOL_MAP = { 'gcc-4.0' => :gcc_4_0,
'gcc-4.2' => :gcc, 'gcc-4.2' => :gcc,
'llvm-gcc' => :llvm, 'llvm-gcc' => :llvm,
@ -105,8 +104,7 @@ module SharedEnvExtension
end end
end end
elsif homebrew_cc elsif homebrew_cc
cc = COMPILER_ALIASES.fetch(homebrew_cc, homebrew_cc) COMPILER_SYMBOL_MAP.fetch(homebrew_cc) { MacOS.default_compiler }
COMPILER_SYMBOL_MAP.fetch(cc) { MacOS.default_compiler }
else else
MacOS.default_compiler MacOS.default_compiler
end end