From 97bb9c5b73f493ddff3556c7932f740cf39db113 Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Fri, 3 Jan 2014 17:58:31 -0800 Subject: stdenv: fix self.cc check Since ENV.cc/cxx are accessors to ENV, any values being passed through are coerced into strings, which means that a nil `ENV.cc` is actually an empty string - which isn't considered to be false in Ruby. Fixes mistydemeo/tigerbrew#161. Fixes mistydemeo/tigerbrew#135. --- Library/Homebrew/extend/ENV/std.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Library') diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index b9cbfbc68..84d3bea72 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -131,7 +131,7 @@ module Stdenv self.cc = MacOS.locate("gcc-4.2") self.cxx = MacOS.locate("g++-4.2") - unless cc + if cc.empty? self.cc = "#{HOMEBREW_PREFIX}/bin/gcc-4.2" self.cxx = "#{HOMEBREW_PREFIX}/bin/g++-4.2" raise "GCC could not be found" unless File.exist? cc -- cgit v1.2.3