admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the androideabi toolchain not matching host

Browse Source 
The included method of determining the host platform in the androideabi
would not match to windows if RUBY_PLATFORM returned mingw, wince, or
emx. As an added pre-caution, using a case statement with regexp
matching will better determine the host platform since it won't be case
sensitive and for windows is set to match more specifially than just
"win".
This commit is contained in:
Robert Rowe
2013-07-08 21:16:16 -07:00
parent f774e3f929
commit e47e8a2512
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tasks/toolchains/androideabi.rake
+8 -7
View File
@@ -41,20 +41,21 @@ MRuby::Toolchain.new(:androideabi) do |conf|
end
if ANDROID_STANDALONE_TOOLCHAIN == nil then
if RUBY_PLATFORM.include?('darwin') then
HOST_PLATFORM = 'darwin-x86'
elsif RUBY_PLATFORM.include?('linux') then
HOST_PLATFORM = 'linux-x86'
elsif RUBY_PLATFORM.include?('win') then
case RUBY_PLATFORM
when /cygwin|mswin|mingw|bccwin|wince|emx/i
HOST_PLATFORM = 'windows'
when /darwin/i
HOST_PLATFORM = 'darwin-x86'
when /linux/i
HOST_PLATFORM = 'linux-x86'
else
# Unknown host platform.
# Unknown host platform
end
ANDROID_TARGET_PLATFORM = ENV['ANDROID_TARGET_PLATFORM'] || DEFAULT_ANDROID_TARGET_PLATFORM
path_to_toolchain = ANDROID_NDK_HOME + '/toolchains/'
path_to_sysroot = ANDROID_NDK_HOME + '/platforms/' + ANDROID_TARGET_PLATFORM
path_to_sysroot = ANDROID_NDK_HOME + '/platforms/' + ANDROID_TARGET_PLATFORM
if ANDROID_TOOLCHAIN.downcase == 'gcc' then
case ANDROID_TARGET_ARCH.downcase
when 'arch-arm', 'arm' then