Explicitly set OBJC in the environment

Fixes #10951.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

4 files changed, 7 insertions, 4 deletions

diff --git a/Library/Formula/gst-plugins-bad.rb b/Library/Formula/gst-plugins-bad.rb
index 6e702157a..9d49fb870 100644
--- a/Library/Formula/gst-plugins-bad.rb
+++ b/Library/Formula/gst-plugins-bad.rb
@@ -25,7 +25,6 @@ class GstPluginsBad < Formula
 
   def install
     ENV.append "CFLAGS", "-no-cpp-precomp -funroll-loops -fstrict-aliasing"
-    ENV['OBJC'] = ENV.cc
     system "./configure", "--prefix=#{prefix}",
                           "--disable-debug",
                           "--disable-dependency-tracking",
diff --git a/Library/Formula/gst-plugins-good.rb b/Library/Formula/gst-plugins-good.rb
index 07bd81431..f5f7efc8d 100644
--- a/Library/Formula/gst-plugins-good.rb
+++ b/Library/Formula/gst-plugins-good.rb
@@ -26,7 +26,6 @@ class GstPluginsGood < Formula
   depends_on 'taglib' => :optional
 
   def install
-    ENV['OBJC'] = ENV.cc
     system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
diff --git a/Library/Formula/r.rb b/Library/Formula/r.rb
index ee0de2b80..5a527df88 100644
--- a/Library/Formula/r.rb
+++ b/Library/Formula/r.rb
@@ -36,8 +36,6 @@ class R < Formula
 
     ENV.fortran
     ENV.x11 # So PNG gets added to the x11 and cairo plotting devices
-    ENV['OBJC'] = ENV['CC']
-    ENV['OBJCFLAGS'] = ENV['CFLAGS']
 
     args = [
       "--prefix=#{prefix}",
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'