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

Explicitly set OBJC in the environment

Browse Source 
Fixes Homebrew/homebrew#10951.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-03-16 16:27:35 -05:00
parent ee73c30aa5
commit fe58c056d3
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ module HomebrewEnvExtension
self.send @compiler self.send @compiler
ENV['CC'] = '/usr/bin/cc' ENV['CC'] = '/usr/bin/cc'
ENV['CXX'] = '/usr/bin/c++' ENV['CXX'] = '/usr/bin/c++'
ENV['OBJC'] = ENV['CC']
end end
# In rare cases this may break your builds, as the tool for some reason wants # In rare cases this may break your builds, as the tool for some reason wants
@ -88,6 +89,7 @@ module HomebrewEnvExtension
# we don't use xcrun because gcc 4.0 has not been provided since Xcode 4 # we don't use xcrun because gcc 4.0 has not been provided since Xcode 4
self['CC'] = "#{MacOS.dev_tools_path}/gcc-4.0" self['CC'] = "#{MacOS.dev_tools_path}/gcc-4.0"
self['CXX'] = "#{MacOS.dev_tools_path}/g++-4.0" self['CXX'] = "#{MacOS.dev_tools_path}/g++-4.0"
self['OBJC'] = self['CC']
replace_in_cflags '-O4', '-O3' replace_in_cflags '-O4', '-O3'
set_cpu_cflags 'nocona -mssse3', :core => 'prescott', :bottle => 'generic' set_cpu_cflags 'nocona -mssse3', :core => 'prescott', :bottle => 'generic'
@compiler = :gcc @compiler = :gcc
@ -127,6 +129,7 @@ module HomebrewEnvExtension
ENV['CC'] = `/usr/bin/xcrun -find #{$1}`.chomp if $1 ENV['CC'] = `/usr/bin/xcrun -find #{$1}`.chomp if $1
ENV['CXX'] =~ %r{/usr/bin/xcrun (.*)} ENV['CXX'] =~ %r{/usr/bin/xcrun (.*)}
ENV['CXX'] = `/usr/bin/xcrun -find #{$1}`.chomp if $1 ENV['CXX'] = `/usr/bin/xcrun -find #{$1}`.chomp if $1
ENV['OBJC'] = ENV['CC']
end end
def gcc def gcc
@ -136,10 +139,12 @@ module HomebrewEnvExtension
ENV['CC'] = xcrun "gcc-4.2" ENV['CC'] = xcrun "gcc-4.2"
ENV['CXX'] = xcrun "g++-4.2" ENV['CXX'] = xcrun "g++-4.2"
ENV['OBJC'] = ENV['CC']
unless ENV['CC'] unless ENV['CC']
ENV['CC'] = "#{HOMEBREW_PREFIX}/bin/gcc-4.2" ENV['CC'] = "#{HOMEBREW_PREFIX}/bin/gcc-4.2"
ENV['CXX'] = "#{HOMEBREW_PREFIX}/bin/g++-4.2" ENV['CXX'] = "#{HOMEBREW_PREFIX}/bin/g++-4.2"
ENV['OBJC'] = ENV['CC']
raise "GCC could not be found" if not File.exist? ENV['CC'] raise "GCC could not be found" if not File.exist? ENV['CC']
end end
@ -156,6 +161,7 @@ module HomebrewEnvExtension
def llvm def llvm
self['CC'] = xcrun "llvm-gcc" self['CC'] = xcrun "llvm-gcc"
self['CXX'] = xcrun "llvm-g++" self['CXX'] = xcrun "llvm-g++"
self['OBJC'] = self['CC']
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 = :llvm @compiler = :llvm
end end
@ -163,6 +169,7 @@ module HomebrewEnvExtension
def clang def clang
self['CC'] = xcrun "clang" self['CC'] = xcrun "clang"
self['CXX'] = xcrun "clang++" self['CXX'] = xcrun "clang++"
self['OBJC'] = self['CC']
replace_in_cflags(/-Xarch_i386 (-march=\S*)/, '\1') replace_in_cflags(/-Xarch_i386 (-march=\S*)/, '\1')
# Clang mistakenly enables AES-NI on plain Nehalem # Clang mistakenly enables AES-NI on plain Nehalem
set_cpu_cflags 'native', :nehalem => 'native -Xclang -target-feature -Xclang -aes' set_cpu_cflags 'native', :nehalem => 'native -Xclang -target-feature -Xclang -aes'