superenv: don't set CC in ENV.clang/etc.

These methods were overriding CC and causing superenv to potentially
skip the compiler wrapper - especially if no wrapper existed for the
compiler being used, e.g. GNU GCCs.

Closes #22443.
Fixes #22249.
Fixes #22424.
Fixes #22506.
Fixes #22521.
Fixes Homebrew/versions#207.

1 files changed, 4 insertions, 9 deletions

diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index 563f8955d..d02013bd4 100644
--- a/Library/Homebrew/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/ENV/super.rb
@@ -262,22 +262,17 @@ module Superenv
   end
   alias_method :j1, :deparallelize
   def gcc
-    self.cc  = self['HOMEBREW_CC'] = "gcc-4.2"
-    self.cxx = "g++-4.2"
+    self['HOMEBREW_CC'] = "gcc-4.2"
   end
   def llvm
-    self.cc  = self['HOMEBREW_CC'] = "llvm-gcc"
-    self.cxx = "llvm-g++-4.2"
+    self['HOMEBREW_CC'] = "llvm-gcc"
   end
   def clang
-    self.cc  = self['HOMEBREW_CC'] = "clang"
-    self.cxx = "clang++"
+    self['HOMEBREW_CC'] = "clang"
   end
   GNU_GCC_VERSIONS.each do |n|
     define_method(:"gcc-4.#{n}") do
-      gcc = "gcc-4.#{n}"
-      self.cc = self['HOMEBREW_CC'] = gcc
-      self.cxx = gcc.gsub('c', '+')
+      self['HOMEBREW_CC'] = "gcc-4.#{n}"
     end
   end
   def make_jobs