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

Recommit ENV changes

Browse Source
This commit is contained in:
Misty De Meo 2014-01-04 01:20:56 -08:00
parent 3cf2cc853d
commit d7a6161751
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,7 @@ module Stdenv
self.cxx = "#{MacOS.dev_tools_path}/g++-4.0" self.cxx = "#{MacOS.dev_tools_path}/g++-4.0"
replace_in_cflags '-O4', '-O3' replace_in_cflags '-O4', '-O3'
set_cpu_cflags '-march=nocona -mssse3' set_cpu_cflags '-march=nocona -mssse3'
@compiler = :gcc @compiler = :gcc_4_0
end end
alias_method :gcc_4_0, :gcc_4_0_1 alias_method :gcc_4_0, :gcc_4_0_1
@ -131,7 +131,7 @@ 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 cc if cc.empty?
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? cc raise "GCC could not be found" unless File.exist? cc

3
Library/Homebrew/os/mac.rb
View File

@ -99,11 +99,12 @@ module OS
def default_cc def default_cc
cc = locate 'cc' cc = locate 'cc'
Pathname.new(cc).realpath.basename.to_s rescue nil cc.realpath.basename.to_s rescue nil
end end
def default_compiler def default_compiler
case default_cc case default_cc
when /^gcc-4.0/ then :gcc_4_0
when /^gcc/ then :gcc when /^gcc/ then :gcc
when /^llvm/ then :llvm when /^llvm/ then :llvm
when "clang" then :clang when "clang" then :clang