admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Don't call methods on xcrun_path if it's nil

Browse Source
This commit is contained in:
Jack Nagel 2013-02-01 13:36:53 -06:00
parent 1bb5d4e031
commit 7b93130a39
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/macos.rb
View File

@ -36,12 +36,11 @@ module MacOS extend self
# look in dev_tools_path, and finally in xctoolchain_path, because the # look in dev_tools_path, and finally in xctoolchain_path, because the
# tools were split over two locations beginning with Xcode 4.3+. # tools were split over two locations beginning with Xcode 4.3+.
xcrun_path = unless Xcode.bad_xcode_select_path? xcrun_path = unless Xcode.bad_xcode_select_path?
`/usr/bin/xcrun -find #{tool} 2>/dev/null`.chomp path = `/usr/bin/xcrun -find #{tool} 2>/dev/null`.chomp
# If xcrun finds a superenv tool then discard the result.
path unless path.include?(HOMEBREW_PREFIX/"Library/ENV")
end end
# If xcrun finds a superenv tool then discard the result.
xcrun_path = nil if xcrun_path.include? HOMEBREW_PREFIX+"Library/ENV"
paths = %W[#{xcrun_path} paths = %W[#{xcrun_path}
#{dev_tools_path}/#{tool} #{dev_tools_path}/#{tool}
#{xctoolchain_path}/usr/bin/#{tool}] #{xctoolchain_path}/usr/bin/#{tool}]