diff options
| author | Jack Nagel | 2012-03-16 16:27:35 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-03-16 16:36:17 -0500 |
| commit | fe58c056d3ca69a3bcda68e2603ebb771cdbcc46 (patch) | |
| tree | 9dcd2746ee0f7b0ea8190258d3269feb397cb2d5 /Library/Homebrew/extend | |
| parent | ee73c30aa59c92e8d3f98eb60ad2f0d8caa39970 (diff) | |
| download | brew-fe58c056d3ca69a3bcda68e2603ebb771cdbcc46.tar.bz2 | |
Explicitly set OBJC in the environment
Fixes Homebrew/homebrew#10951.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 4db3cd504..ce38bf82d 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -34,6 +34,7 @@ module HomebrewEnvExtension self.send @compiler ENV['CC'] = '/usr/bin/cc' ENV['CXX'] = '/usr/bin/c++' + ENV['OBJC'] = ENV['CC'] end # 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 self['CC'] = "#{MacOS.dev_tools_path}/gcc-4.0" self['CXX'] = "#{MacOS.dev_tools_path}/g++-4.0" + self['OBJC'] = self['CC'] replace_in_cflags '-O4', '-O3' set_cpu_cflags 'nocona -mssse3', :core => 'prescott', :bottle => 'generic' @compiler = :gcc @@ -127,6 +129,7 @@ module HomebrewEnvExtension ENV['CC'] = `/usr/bin/xcrun -find #{$1}`.chomp if $1 ENV['CXX'] =~ %r{/usr/bin/xcrun (.*)} ENV['CXX'] = `/usr/bin/xcrun -find #{$1}`.chomp if $1 + ENV['OBJC'] = ENV['CC'] end def gcc @@ -136,10 +139,12 @@ module HomebrewEnvExtension ENV['CC'] = xcrun "gcc-4.2" ENV['CXX'] = xcrun "g++-4.2" + ENV['OBJC'] = ENV['CC'] unless ENV['CC'] ENV['CC'] = "#{HOMEBREW_PREFIX}/bin/gcc-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'] end @@ -156,6 +161,7 @@ module HomebrewEnvExtension def llvm self['CC'] = xcrun "llvm-gcc" self['CXX'] = xcrun "llvm-g++" + self['OBJC'] = self['CC'] set_cpu_cflags 'core2 -msse4', :penryn => 'core2 -msse4.1', :core2 => 'core2', :core => 'prescott' @compiler = :llvm end @@ -163,6 +169,7 @@ module HomebrewEnvExtension def clang self['CC'] = xcrun "clang" self['CXX'] = xcrun "clang++" + self['OBJC'] = self['CC'] replace_in_cflags(/-Xarch_i386 (-march=\S*)/, '\1') # Clang mistakenly enables AES-NI on plain Nehalem set_cpu_cflags 'native', :nehalem => 'native -Xclang -target-feature -Xclang -aes' |
