From b78a4b7372ed338a078f1378f333b736c1fb3287 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 15 Apr 2014 11:25:00 -0500 Subject: [PATCH] Don't call xcrun twice --- Library/Homebrew/os/mac.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb index 3a2a31986d..f1e3b2a2e5 100644 --- a/Library/Homebrew/os/mac.rb +++ b/Library/Homebrew/os/mac.rb @@ -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"