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

Remove another unnecessary check

Browse Source
This commit is contained in:
Jack Nagel 2014-04-15 11:23:57 -05:00
parent 490cb34885
commit 2f052a2f65
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/os/mac.rb
View File

@ -36,7 +36,7 @@ module OS
# If it's not there, or xcode-select is misconfigured, we have to # 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 # 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 = begin
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. # If xcrun finds a superenv tool then discard the result.
path unless path.include?("Library/ENV") path unless path.include?("Library/ENV")
@ -60,7 +60,7 @@ module OS
elsif tools_in_prefix? "/" elsif tools_in_prefix? "/"
# probably a safe enough assumption (the unix way) # probably a safe enough assumption (the unix way)
Pathname.new "/usr/bin" 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 # Note that the exit status of system "xcrun foo" isn't always accurate
# Wherever "make" is there are the dev tools. # Wherever "make" is there are the dev tools.
Pathname.new(`/usr/bin/xcrun -find make`.chomp).dirname Pathname.new(`/usr/bin/xcrun -find make`.chomp).dirname
@ -88,7 +88,7 @@ module OS
(@sdk_path ||= {}).fetch(v.to_s) do |key| (@sdk_path ||= {}).fetch(v.to_s) do |key|
opts = [] opts = []
# First query Xcode itself # 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 # Xcode.prefix is pretty smart, so lets look inside to find the sdk
opts << "#{Xcode.prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX#{v}.sdk" opts << "#{Xcode.prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX#{v}.sdk"
# Xcode < 4.3 style # Xcode < 4.3 style