MacOS: remove unnecessary begin block
This commit is contained in:
parent
592b5d91a0
commit
e887232b7e
@ -77,7 +77,6 @@ module MacOS extend self
|
|||||||
|
|
||||||
def sdk_path(v = version)
|
def sdk_path(v = version)
|
||||||
(@sdk_path ||= {}).fetch(v.to_s) do
|
(@sdk_path ||= {}).fetch(v.to_s) do
|
||||||
@sdk_path[v.to_s] = begin
|
|
||||||
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 unless Xcode.bad_xcode_select_path?
|
||||||
@ -85,8 +84,7 @@ module MacOS extend self
|
|||||||
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
|
||||||
opts << "/Developer/SDKs/MacOSX#{v}.sdk"
|
opts << "/Developer/SDKs/MacOSX#{v}.sdk"
|
||||||
opts.map{|a| Pathname.new(a) }.detect { |p| p.directory? }
|
@sdk_path[v.to_s] = opts.map { |a| Pathname.new(a) }.detect(&:directory?)
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user