diff options
| author | Jack Nagel | 2014-04-20 16:33:41 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-04-20 16:33:41 -0500 |
| commit | dd8dc7a38099d9c7f1ffd47b542f1d4dbe7379fc (patch) | |
| tree | 675c07b9b2dbc4f270e316b07ade0bf66d944a64 /Library/ENV | |
| parent | 749c877f032f4990581eec636ffcf1a826e5b4e9 (diff) | |
| download | brew-dd8dc7a38099d9c7f1ffd47b542f1d4dbe7379fc.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-x | Library/ENV/4.3/xcrun | 6 |
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| |
