diff --git a/Library/Homebrew/extend/fileutils.rb b/Library/Homebrew/extend/fileutils.rb
index 6a45ad51f9..c2c36dc403 100644
--- a/Library/Homebrew/extend/fileutils.rb
+++ b/Library/Homebrew/extend/fileutils.rb
@@ -90,4 +90,11 @@ module FileUtils extend self
   def ruby *args
     system RUBY_PATH, *args
   end
+
+  def xcodebuild *args
+    removed = ENV.remove_cc_etc
+    system "xcodebuild", *args
+  ensure
+    ENV.update(removed)
+  end
 end
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 141f126362..a4e5c17227 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -565,6 +565,7 @@ class Formula
     ohai "#{cmd} #{pretty_args*' '}".strip
 
     if cmd.to_s.start_with? "xcodebuild"
+      opoo %{system "xcodebuild" is deprecated, use the xcodebuild method instead}
       removed_ENV_variables.update(ENV.remove_cc_etc)
     end