diff options
| author | Jack Nagel | 2014-05-19 10:37:45 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-05-19 10:37:45 -0500 |
| commit | 67d05fa3d124b7a373c1442b7ba24ea6fe53df1b (patch) | |
| tree | 1f0d335e79c782e83d78e64f6c99e2949ebbe6f3 | |
| parent | bef3b80155b057b6907203a4861214b089693615 (diff) | |
| download | homebrew-67d05fa3d124b7a373c1442b7ba24ea6fe53df1b.tar.bz2 | |
Remove deprecated --use-{gcc,llvm,clang}
Closes #29380.
| -rw-r--r-- | Library/Homebrew/cmd/install.rb | 13 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ENV/shared.rb | 10 |
2 files changed, 0 insertions, 23 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 2308723dc..cf652b17a 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -6,19 +6,6 @@ module Homebrew extend self def install 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' raise "Specify `--HEAD` in uppercase to build from trunk." end diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb index eb87efc9e..743c36fce 100644 --- a/Library/Homebrew/extend/ENV/shared.rb +++ b/Library/Homebrew/extend/ENV/shared.rb @@ -91,16 +91,6 @@ module SharedEnvExtension raise "Invalid value for --cc: #{other}" 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 cc = COMPILER_ALIASES.fetch(homebrew_cc, homebrew_cc) COMPILER_SYMBOL_MAP.fetch(cc) { MacOS.default_compiler } |
