aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend/ENV/std.rb
diff options
context:
space:
mode:
authorJack Nagel2014-04-29 21:11:03 -0500
committerJack Nagel2014-04-29 21:11:03 -0500
commit259bbdf76c67167cf43234bf6774d90f70aebd2d (patch)
tree762311f322ef545336fac6d083dc48c511e9c5ac /Library/Homebrew/extend/ENV/std.rb
parent32b7c9ff150c0b4bbabd75a73840a14f4ba64f80 (diff)
downloadbrew-259bbdf76c67167cf43234bf6774d90f70aebd2d.tar.bz2
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.
Diffstat (limited to 'Library/Homebrew/extend/ENV/std.rb')
-rw-r--r--Library/Homebrew/extend/ENV/std.rb12
1 files changed, 1 insertions, 11 deletions
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