admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

ENV: use cc accessor

Browse Source
This commit is contained in:
Jack Nagel 2013-08-30 16:44:49 -05:00
parent aa79e21ba4
commit cc37943267
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/extend/ENV/std.rb
View File

@ -61,7 +61,7 @@ module Stdenv
self.send self.compiler self.send self.compiler
# we must have a working compiler! # we must have a working compiler!
unless self['CC'] unless cc
@compiler = MacOS.default_compiler @compiler = MacOS.default_compiler
self.send @compiler self.send @compiler
self.cc = MacOS.locate("cc") self.cc = MacOS.locate("cc")
@ -147,14 +147,14 @@ module Stdenv
self.cc = MacOS.locate("gcc-4.2") self.cc = MacOS.locate("gcc-4.2")
self.cxx = MacOS.locate("g++-4.2") self.cxx = MacOS.locate("g++-4.2")
unless self['CC'] unless cc
self.cc = "#{HOMEBREW_PREFIX}/bin/gcc-4.2" self.cc = "#{HOMEBREW_PREFIX}/bin/gcc-4.2"
self.cxx = "#{HOMEBREW_PREFIX}/bin/g++-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 end
if not self['CC'] =~ %r{^/usr/bin/xcrun } unless cc =~ %r{^/usr/bin/xcrun }
raise "GCC could not be found" if Pathname.new(self['CC']).realpath.to_s =~ /llvm/ raise "GCC could not be found" if Pathname.new(cc).realpath.to_s =~ /llvm/
end end
replace_in_cflags '-O4', '-O3' replace_in_cflags '-O4', '-O3'