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

ENV.gcc: search HOMEBREW_PREFIX/bin for gcc-4.2

Browse Source 
Allow the use of a Homebrewed gcc-4.2 in order to support homebrew-alt's
apple-gcc42 formula.

This also removes the :force filtering for the gcc-4.2 check error.

Closes Homebrew/homebrew#9384.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
This commit is contained in:
Misty De Meo 2012-01-02 17:20:30 -06:00
parent 79439626b5
commit 1ed22ff1c3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/extend/ENV.rb
View File

@ -83,13 +83,15 @@ module HomebrewEnvExtension
alias_method :gcc_4_0, :gcc_4_0_1 alias_method :gcc_4_0, :gcc_4_0_1
def gcc args = {} def gcc args = {}
self['CC'] = "/usr/bin/gcc-4.2" gcc_path = Pathname.new "/usr/bin/gcc-4.2"
self['CXX'] = "/usr/bin/g++-4.2" gxx_path = Pathname.new "/usr/bin/g++-4.2"
self['CC'] = gcc_path.exist? ? gcc_path : HOMEBREW_PREFIX+'bin/gcc-4.2'
self['CXX'] = gxx_path.exist? ? gxx_path : HOMEBREW_PREFIX+'bin/g++-4.2'
replace_in_cflags '-O4', '-O3' replace_in_cflags '-O4', '-O3'
set_cpu_cflags 'core2 -msse4', :penryn => 'core2 -msse4.1', :core2 => 'core2', :core => 'prescott' set_cpu_cflags 'core2 -msse4', :penryn => 'core2 -msse4.1', :core2 => 'core2', :core => 'prescott'
@compiler = :gcc @compiler = :gcc
raise "GCC could not be found" if args[:force] and not File.exist? ENV['CC'] \ raise "GCC could not be found" if not File.exist? ENV['CC'] \
or (Pathname.new(ENV['CC']).realpath.to_s =~ /llvm/) or (Pathname.new(ENV['CC']).realpath.to_s =~ /llvm/)
end end
alias_method :gcc_4_2, :gcc alias_method :gcc_4_2, :gcc