Skip to content
Snippets Groups Projects
Commit b78a4b73 authored by Jack Nagel's avatar Jack Nagel
Browse files

Don't call xcrun twice

parent 2f052a2f
No related branches found
No related tags found
No related merge requests found
......@@ -60,10 +60,9 @@ module OS
elsif tools_in_prefix? "/"
# probably a safe enough assumption (the unix way)
Pathname.new "/usr/bin"
elsif not `/usr/bin/xcrun -find make 2>/dev/null`.empty?
elsif not (make_path = `/usr/bin/xcrun -find make 2>/dev/null`).empty?
# Note that the exit status of system "xcrun foo" isn't always accurate
# Wherever "make" is there are the dev tools.
Pathname.new(`/usr/bin/xcrun -find make`.chomp).dirname
Pathname.new(make_path.chomp).dirname
elsif File.exist? "#{Xcode.prefix}/usr/bin/make"
# cc stopped existing with Xcode 4.3, there are c89 and c99 options though
Pathname.new "#{Xcode.prefix}/usr/bin"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment