aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-04-15 11:23:57 -0500
committerJack Nagel2014-04-15 11:26:03 -0500
commit2f052a2f65ea245c63c777656a50aee5d82a2c2f (patch)
tree3b12d795ad32f2043d3c7bf40cedbf73028f3b4a
parent490cb34885d459c4c840feaad16e2f3560b6284f (diff)
downloadbrew-2f052a2f65ea245c63c777656a50aee5d82a2c2f.tar.bz2
Remove another unnecessary check
-rw-r--r--Library/Homebrew/os/mac.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index fe5bb84cf..3a2a31986 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -36,7 +36,7 @@ module OS
# If it's not there, or xcode-select is misconfigured, we have to
# look in dev_tools_path, and finally in xctoolchain_path, because the
# tools were split over two locations beginning with Xcode 4.3+.
- xcrun_path = unless Xcode.bad_xcode_select_path?
+ xcrun_path = begin
path = `/usr/bin/xcrun -find #{tool} 2>/dev/null`.chomp
# If xcrun finds a superenv tool then discard the result.
path unless path.include?("Library/ENV")
@@ -60,7 +60,7 @@ module OS
elsif tools_in_prefix? "/"
# probably a safe enough assumption (the unix way)
Pathname.new "/usr/bin"
- elsif not Xcode.bad_xcode_select_path? and not `/usr/bin/xcrun -find make 2>/dev/null`.empty?
+ elsif not `/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
@@ -88,7 +88,7 @@ module OS
(@sdk_path ||= {}).fetch(v.to_s) do |key|
opts = []
# First query Xcode itself
- opts << `#{locate('xcodebuild')} -version -sdk macosx#{v} Path 2>/dev/null`.chomp unless Xcode.bad_xcode_select_path?
+ opts << `#{locate('xcodebuild')} -version -sdk macosx#{v} Path 2>/dev/null`.chomp
# Xcode.prefix is pretty smart, so lets look inside to find the sdk
opts << "#{Xcode.prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX#{v}.sdk"
# Xcode < 4.3 style