From 089af6627aad3f6e166705102548a0bf4f4c59fc Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Thu, 8 May 2014 17:10:08 -0500
Subject: [PATCH] Always use stub tools in /usr/bin on 10.9

---
 Library/ENV/4.3/xcrun                | 1 +
 Library/Homebrew/extend/ENV/super.rb | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/Library/ENV/4.3/xcrun b/Library/ENV/4.3/xcrun
index a4d2beacfc..7443cec179 100755
--- a/Library/ENV/4.3/xcrun
+++ b/Library/ENV/4.3/xcrun
@@ -15,6 +15,7 @@ arg0 = ARGV.shift
 
 exe = "/usr/bin/#{arg0}"
 if File.executable?(exe)
+  exec(exe, *ARGV) if ENV["HOMEBREW_PREFER_CLT_PROXIES"]
   sdkroot = ENV["HOMEBREW_SDKROOT"]
   exec(exe, *ARGV) unless sdkroot && File.directory?(sdkroot)
 end
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index 76d26836b4..a1e852f27c 100644
--- a/Library/Homebrew/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/ENV/super.rb
@@ -83,6 +83,10 @@ module Superenv
     self['ACLOCAL_PATH'] = determine_aclocal_path
     self['M4'] = MacOS.locate("m4") if deps.include? "autoconf"
 
+    # On 10.9, the tools in /usr/bin proxy to the active developer directory.
+    # This means we can use them for any combination of CLT and Xcode.
+    self["HOMEBREW_PREFER_CLT_PROXIES"] = "1" if MacOS.version == "10.9"
+
     # The HOMEBREW_CCCFG ENV variable is used by the ENV/cc tool to control
     # compiler flag stripping. It consists of a string of characters which act
     # as flags. Some of these flags are mutually exclusive.