aboutsummaryrefslogtreecommitdiffstats
path: root/Library/ENV
diff options
context:
space:
mode:
authorMisty De Meo2013-05-27 12:54:07 -0500
committerMisty De Meo2013-05-27 12:56:25 -0500
commitd212b360eca4969109a3bfcf0fd86e45b75554f7 (patch)
tree9d65dfcbae319a5f09cd60c63fd4c77a1b0b1ee1 /Library/ENV
parent52d84ba7cfef0e10ced214bee7f18aa978799e26 (diff)
downloadbrew-d212b360eca4969109a3bfcf0fd86e45b75554f7.tar.bz2
superenv: Improve compiler selection
This fixes superenv on Xcode 3.2.6, and also fixes C++ software with gcc-4.2 on all Xcodes.
Diffstat (limited to 'Library/ENV')
-rwxr-xr-xLibrary/ENV/4.3/cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/Library/ENV/4.3/cc b/Library/ENV/4.3/cc
index 3d6241c1f..b96c0015e 100755
--- a/Library/ENV/4.3/cc
+++ b/Library/ENV/4.3/cc
@@ -62,12 +62,15 @@ class Cmd
# the work since Makefiles are dumb and include a lot of excess flags.
ENV['HOMEBREW_CC']
when 'c++'
- if ENV['HOMEBREW_CC'] =~ /llvm-gcc/
+ case ENV['HOMEBREW_CC']
+ when /clang/
+ 'clang++'
+ when /llvm-gcc/
'g++'
- elsif ENV['HOMEBREW_CC'] =~ /gcc-4.2/
+ when /gcc(-4.2)?$/
'g++-4.2'
- else
- 'clang++'
+ when /gcc-4.0/
+ 'g++-4.0'
end
else
@arg0