From 51a487de182351ddd3221965347770391aacdfea Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Tue, 10 Sep 2013 23:09:20 -0700 Subject: [PATCH] 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 Homebrew/homebrew#22443. Fixes Homebrew/homebrew#22249. Fixes Homebrew/homebrew#22424. Fixes Homebrew/homebrew#22506. Fixes Homebrew/homebrew#22521. Fixes Homebrew/versions#207. --- Library/Homebrew/extend/ENV/super.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 563f8955d6..d02013bd40 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