Add --cc= syntax for selecting compilers

This commit is contained in:
Misty De Meo 2013-08-23 22:25:35 -07:00
parent 774cd8b68b
commit 221bb2419f
4 changed files with 12 additions and 2 deletions

View File

@ -183,6 +183,10 @@ module HomebrewArgvExtension
replace(old_args)
end
def cc
value 'cc'
end
private
def downcased_unique_named

View File

@ -2,6 +2,8 @@ module SharedEnvExtension
CC_FLAG_VARS = %w{CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS}
FC_FLAG_VARS = %w{FCFLAGS FFLAGS}
COMPILERS = ['clang', 'gcc-4.0', 'gcc-4.2', 'llvm-gcc']
def remove_cc_etc
keys = %w{CC CXX OBJC OBJCXX LD CPP CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS LDFLAGS CPPFLAGS}
removed = Hash[*keys.map{ |key| [key, self[key]] }.flatten]

View File

@ -344,7 +344,9 @@ module Stdenv
# test for --flags first so that installs can be overridden on a per
# install basis. Then test for ENVs in inverse order to flags, this is
# sensible, trust me
@compiler ||= if ARGV.include? '--use-gcc'
@compiler ||= if (cc = ARGV.cc)
COMPILERS.grep(cc).pop ? cc : raise("Invalid value for --cc: #{cc}")
elsif ARGV.include? '--use-gcc'
:gcc
elsif ARGV.include? '--use-llvm'
:llvm

View File

@ -122,7 +122,9 @@ module Superenv
private
def determine_cc
if ARGV.include? '--use-gcc'
if (cc = ARGV.cc)
COMPILERS.grep(cc).pop ? cc : raise("Invalid value for --cc: #{cc}")
elsif ARGV.include? '--use-gcc'
gcc_installed = Formula.factory('apple-gcc42').installed? rescue false
# fall back to something else on systems without Apple gcc
if MacOS.locate('gcc-4.2') || gcc_installed