aboutsummaryrefslogtreecommitdiffstats
path: root/Library/ENV
diff options
context:
space:
mode:
authorJack Nagel2014-04-20 16:33:41 -0500
committerJack Nagel2014-04-20 16:33:41 -0500
commit754bb41ad5cf0dc0376bb38b4427cd0119bdb2d3 (patch)
tree44b8629bf182e5fa2e4c6d93d0cfc1bcda3cb10a /Library/ENV
parentc3585dbb7393bc70a4f84c1a3a541da8342e5b03 (diff)
downloadhomebrew-754bb41ad5cf0dc0376bb38b4427cd0119bdb2d3.tar.bz2
Remove obsolete DEVELOPER_DIR hacks
These days Homebrew refuses to do anything if the xcode-select path is busted, so this workaround is unnecessary.
Diffstat (limited to 'Library/ENV')
-rwxr-xr-xLibrary/ENV/4.3/xcrun6
1 files changed, 2 insertions, 4 deletions
diff --git a/Library/ENV/4.3/xcrun b/Library/ENV/4.3/xcrun
index 6921bb3c4..2eaf4eff4 100755
--- a/Library/ENV/4.3/xcrun
+++ b/Library/ENV/4.3/xcrun
@@ -9,7 +9,7 @@ require "#{dirname}/../libsuperenv"
SUPERBIN = dirname.cleanpath.freeze
# Some build tools are stupid and still set DEVELOPER_DIR to old /Developer
-ENV['DEVELOPER_DIR'] = ENV['HOMEBREW_DEVELOPER_DIR']
+ENV.delete "DEVELOPER_DIR"
exec "/usr/bin/xcrun", *ARGV if ARGV.empty? or ARGV[0][0..0] == '-'
if File.exist?("/usr/bin/#{ARGV.first}")
@@ -23,9 +23,7 @@ end
arg0 = ARGV.shift
try `/usr/bin/xcrun --find #{arg0} 2>/dev/null`.chomp
-# Nuts, Xcode is not setup properly or something. Try to find the tools anyway!
-try "#{ENV['HOMEBREW_DEVELOPER_DIR']}/usr/bin/#{arg0}"
-try "#{ENV['HOMEBREW_DEVELOPER_DIR']}/Toolchains/XcodeDefault.xctoolchain/usr/bin/#{arg0}"
+
# xcrun won't always be able to find Homebrew's apple-gcc42,
# even when it's in the PATH
ENV['PATH'].split(':').each do |p|