From c6b0b563e8a5b39c1e1a433446e00c28d15548df Mon Sep 17 00:00:00 2001
From: Samuel John
Date: Wed, 20 Mar 2013 18:20:18 +0100
Subject: Better superenv support for Xcode elsewhere

- The Library/ENV/4.3/xcrun shim now respects
  ENV['DEVELOPER_DIR'] instead assuming the location
  of /Applications/Xcode.app/Contents/Developer.
- The env var DEVELOPER_DIR is set if it is not
  already. So, during superenv this var is always set
  and we no longer have to care about people with unset
  or wrongly set xcode-select stuff. This has been
  a major PITA in the past.
- determine_developer_dir (which is used to set
  the DEVELOPER_DIR var) now uses MacOS::Xcode.prefix
  which is proven and very capable and uses splotlight
  correctly.
- Replace (and remove) MacSystem.xcode43_developer_dir
  with Xcode.prefix

Closes Homebrew/homebrew#18618
---
 Library/ENV/4.3/xcrun | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Library/ENV')

diff --git a/Library/ENV/4.3/xcrun b/Library/ENV/4.3/xcrun
index 14176a5a7..6afb6cf16 100755
--- a/Library/ENV/4.3/xcrun
+++ b/Library/ENV/4.3/xcrun
@@ -19,8 +19,8 @@ end
 arg0 = ARGV.shift
 try `/usr/bin/xcrun --find #{arg0}`.chomp
 # Nuts, Xcode is not setup properly or something. Try to find the tools anyway!
-try "/Applications/Xcode.app/Contents/Developer/usr/bin/#{arg0}"
-try "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/#{arg0}"
+try "#{ENV['DEVELOPER_DIR']}/usr/bin/#{arg0}"
+try "#{ENV['DEVELOPER_DIR']}/Toolchains/XcodeDefault.xctoolchain/usr/bin/#{arg0}"
 try "/usr/bin/#{arg0}"
 
 abort <<-EOS
-- 
cgit v1.2.3