diff options
| author | Felix Jones <[email protected]> | 2016-10-07 22:31:24 +0100 |
|---|---|---|
| committer | Felix Jones <[email protected]> | 2016-10-07 22:31:24 +0100 |
| commit | 5fd068eb4d5361adf162e1f9ddc9cd11ae96a566 (patch) | |
| tree | 482016dc8136ab7fb01bbb85d82651fe25b3f264 /tasks/toolchains | |
| parent | 2d335daeeb1d50402041041c7a3531674a2e735a (diff) | |
| download | mruby-5fd068eb4d5361adf162e1f9ddc9cd11ae96a566.tar.gz mruby-5fd068eb4d5361adf162e1f9ddc9cd11ae96a566.zip | |
Android task: NDK default search paths now favour ndk-bundle. Added macOS NDK search paths.
Diffstat (limited to 'tasks/toolchains')
| -rw-r--r-- | tasks/toolchains/android.rake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tasks/toolchains/android.rake b/tasks/toolchains/android.rake index 376185762..290354caa 100644 --- a/tasks/toolchains/android.rake +++ b/tasks/toolchains/android.rake @@ -5,9 +5,12 @@ class MRuby::Toolchain::Android DEFAULT_TOOLCHAIN = :clang DEFAULT_NDK_HOMES = %w{ - /usr/local/opt/android-ndk /usr/local/opt/android-sdk/ndk-bundle + /usr/local/opt/android-ndk %LOCALAPPDATA%/Android/android-sdk/ndk-bundle + %LOCALAPPDATA%/Android/android-ndk + ~/Library/Android/sdk/ndk-bundle + ~/Library/Android/ndk } TOOLCHAINS = [:clang] # TODO : Add gcc support @@ -92,6 +95,7 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter DEFAULT_NDK_HOMES.find { |path| path.gsub! '%LOCALAPPDATA%', ENV['LOCALAPPDATA'] || '%LOCALAPPDATA%' path.gsub! '\\', '/' + path.gsub! '~', Dir.home || '~' File.directory?(path) } || raise(AndroidNDKHomeNotFound) ) @@ -195,7 +199,7 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter flags += %W(-D__android__ --sysroot="#{sysroot}") case toolchain when :clang - flags += %W(-gcc-toolchain #{toolchain_path.to_s}) + flags += %W(-gcc-toolchain "#{toolchain_path.to_s}") case arch when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi) when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi) |