From 259bbdf76c67167cf43234bf6774d90f70aebd2d Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 29 Apr 2014 21:11:03 -0500 Subject: Drop obsolete compiler fallback in stdenv This code originated in a slightly different form in 8e88b22fd1ec65a344ce6e4facd6dad4b415b2ad: https://github.com/Homebrew/homebrew/blob/8e88b22fd1ec65a344ce6e4facd6dad4b415b2ad/Library/Homebrew/extend/ENV.rb#L30-L32 Back then, MacOS.default_compiler could return nil, which meant ENV.compiler could do the same. This code was carried forward as the surrounding code changed. At this point it should be unreachable. --- Library/Homebrew/extend/ENV/std.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'Library/Homebrew/extend') diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index e41373a62..fb2741b53 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -58,17 +58,7 @@ module Stdenv append 'LDFLAGS', '-Wl,-headerpad_max_install_names' - # set us up for the user's compiler choice - self.send self.compiler - - # we must have a working compiler! - unless cc - @compiler = MacOS.default_compiler - self.send @compiler - self.cc = MacOS.locate("cc") - self.cxx = MacOS.locate("c++") - end - + send(compiler) validate_cc!(formula) unless formula.nil? if cc =~ GNU_GCC_REGEXP -- cgit v1.2.3