Skip to content

M
mruby
Unverified Commit 572958ec authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto Committed by GitHub
Browse files
Options

Merge pull request #4896 from shuujii/fix-undefined-method-Pathname 

Fix "undefined method `Pathname'"; fix #4895
parents fa90bcb9 9f1167f7
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
tasks/toolchains/android.rake
View file @ 572958ec
...@@ -67,7 +67,7 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter ...@@ -67,7 +67,7 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter
end end
def home_path def home_path
@home_path ||= Pathname( @home_path ||= Pathname.new(
params[:ndk_home] || params[:ndk_home] ||
ENV['ANDROID_NDK_HOME'] || ENV['ANDROID_NDK_HOME'] ||
DEFAULT_NDK_HOMES.find { |path| DEFAULT_NDK_HOMES.find { |path|
...@@ -124,7 +124,7 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter ...@@ -124,7 +124,7 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter
path = home_path.join('toolchains', 'llvm' , 'prebuilt', 'windows*') path = home_path.join('toolchains', 'llvm' , 'prebuilt', 'windows*')
Dir.glob(path.to_s){ |item| Dir.glob(path.to_s){ |item|
next if File.file?(item) next if File.file?(item)
path = Pathname(item) path = Pathname.new(item)
break break
} }
path.basename path.basename
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment