diff options
| author | Jack Nagel | 2013-08-30 16:44:49 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-08-30 18:42:12 -0500 |
| commit | cc379432677aade85667b428a29b8deee2d41d57 (patch) | |
| tree | 992c82d48bbdd4941962295806e6ac468831a526 /Library | |
| parent | aa79e21ba42f246a365425213f2fdec09160233d (diff) | |
| download | brew-cc379432677aade85667b428a29b8deee2d41d57.tar.bz2 | |
ENV: use cc accessor
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV/std.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index 39517be8a..708117ca8 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -61,7 +61,7 @@ module Stdenv self.send self.compiler # we must have a working compiler! - unless self['CC'] + unless cc @compiler = MacOS.default_compiler self.send @compiler self.cc = MacOS.locate("cc") @@ -147,14 +147,14 @@ module Stdenv self.cc = MacOS.locate("gcc-4.2") self.cxx = MacOS.locate("g++-4.2") - unless self['CC'] + unless cc 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? self['CC'] + raise "GCC could not be found" unless File.exist? cc end - if not self['CC'] =~ %r{^/usr/bin/xcrun } - raise "GCC could not be found" if Pathname.new(self['CC']).realpath.to_s =~ /llvm/ + unless cc =~ %r{^/usr/bin/xcrun } + raise "GCC could not be found" if Pathname.new(cc).realpath.to_s =~ /llvm/ end replace_in_cflags '-O4', '-O3' |
