Remove deprecated --use-{gcc,llvm,clang}
Closes Homebrew/homebrew#29380.
This commit is contained in:
parent
4676045bdd
commit
f6fda5651b
@ -6,19 +6,6 @@ module Homebrew extend self
|
|||||||
def install
|
def install
|
||||||
raise FormulaUnspecifiedError if ARGV.named.empty?
|
raise FormulaUnspecifiedError if ARGV.named.empty?
|
||||||
|
|
||||||
{
|
|
||||||
'gcc' => 'gcc-4.2',
|
|
||||||
'llvm' => 'llvm-gcc',
|
|
||||||
'clang' => 'clang'
|
|
||||||
}.each_pair do |old, new|
|
|
||||||
opt = "--use-#{old}"
|
|
||||||
if ARGV.include? opt then opoo <<-EOS.undent
|
|
||||||
#{opt.inspect} is deprecated and will be removed in a future version.
|
|
||||||
Please use "--cc=#{new}" instead.
|
|
||||||
EOS
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if ARGV.include? '--head'
|
if ARGV.include? '--head'
|
||||||
raise "Specify `--HEAD` in uppercase to build from trunk."
|
raise "Specify `--HEAD` in uppercase to build from trunk."
|
||||||
end
|
end
|
||||||
|
|||||||
@ -91,16 +91,6 @@ module SharedEnvExtension
|
|||||||
raise "Invalid value for --cc: #{other}"
|
raise "Invalid value for --cc: #{other}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
elsif ARGV.include? '--use-gcc'
|
|
||||||
if MacOS.locate("gcc-4.2") || HOMEBREW_PREFIX.join("opt/apple-gcc42/bin/gcc-4.2").exist?
|
|
||||||
:gcc
|
|
||||||
else
|
|
||||||
raise "gcc-4.2 not found!"
|
|
||||||
end
|
|
||||||
elsif ARGV.include? '--use-llvm'
|
|
||||||
:llvm
|
|
||||||
elsif ARGV.include? '--use-clang'
|
|
||||||
:clang
|
|
||||||
elsif homebrew_cc
|
elsif homebrew_cc
|
||||||
cc = COMPILER_ALIASES.fetch(homebrew_cc, homebrew_cc)
|
cc = COMPILER_ALIASES.fetch(homebrew_cc, homebrew_cc)
|
||||||
COMPILER_SYMBOL_MAP.fetch(cc) { MacOS.default_compiler }
|
COMPILER_SYMBOL_MAP.fetch(cc) { MacOS.default_compiler }
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user