superenv: Improve compiler selection

This fixes superenv on Xcode 3.2.6, and also fixes C++ software with
gcc-4.2 on all Xcodes.

1 files changed, 7 insertions, 2 deletions

diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb
index b8dfa7f25..8c3d131df 100644
--- a/Library/Homebrew/superenv.rb
+++ b/Library/Homebrew/superenv.rb
@@ -93,7 +93,7 @@ class << ENV
       "gcc"
     elsif ENV['HOMEBREW_CC']
       case ENV['HOMEBREW_CC']
-        when 'clang', 'gcc' then ENV['HOMEBREW_CC']
+        when 'clang', 'gcc', 'gcc-4.0' then ENV['HOMEBREW_CC']
         when 'llvm', 'llvm-gcc' then 'llvm-gcc'
       else
         opoo "Invalid value for HOMEBREW_CC: #{ENV['HOMEBREW_CC']}"
@@ -103,7 +103,12 @@ class << ENV
       raise
     end
   rescue
-    "clang"
+    case MacOS.default_compiler
+    when :clang   then 'clang'
+    when :llvm    then 'llvm-gcc'
+    when :gcc     then 'gcc'
+    when :gcc_4_0 then 'gcc-4.0'
+    end
   end
 
   def determine_path