diff options
| author | crimsonwoods <[email protected]> | 2013-03-14 23:36:28 +0900 |
|---|---|---|
| committer | crimsonwoods <[email protected]> | 2013-03-14 23:36:28 +0900 |
| commit | bb63eb04d02a723592e504f1b796b58154d3aa1c (patch) | |
| tree | f2c851723b60a03820d17d80e144dedd3be02858 | |
| parent | 887ebb8c94cddd7cbd4e711bf1bbca795d50cf7c (diff) | |
| download | mruby-bb63eb04d02a723592e504f1b796b58154d3aa1c.tar.gz mruby-bb63eb04d02a723592e504f1b796b58154d3aa1c.zip | |
bug fix: fix "--sysroot" option and host platform detection.
| -rw-r--r-- | tasks/toolchains/androideabi.rake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tasks/toolchains/androideabi.rake b/tasks/toolchains/androideabi.rake index 9464530fc..a69fd1a9d 100644 --- a/tasks/toolchains/androideabi.rake +++ b/tasks/toolchains/androideabi.rake @@ -43,9 +43,9 @@ MRuby::Toolchain.new(:androideabi) do |conf| if ANDROID_STANDALONE_TOOLCHAIN == nil then if RUBY_PLATFORM.include?('darwin') then HOST_PLATFORM = 'darwin-x86' - elsif RUBY_PLATFORM.include('linux') then + elsif RUBY_PLATFORM.include?('linux') then HOST_PLATFORM = 'linux-x86' - elsif RUBY_PLATFORM.include('win') then + elsif RUBY_PLATFORM.include?('win') then HOST_PLATFORM = 'windows' else # Unknown host platform. @@ -104,8 +104,8 @@ MRuby::Toolchain.new(:androideabi) do |conf| ANDROID_CC = path_to_toolchain + '/bin/' + toolchain_prefix + 'gcc' ANDROID_LD = path_to_toolchain + '/bin/' + toolchain_prefix + 'gcc' ANDROID_AR = path_to_toolchain + '/bin/' + toolchain_prefix + 'ar' - ANDROID_CFLAGS = GCC_COMMON_CFLAGS + %W(-mandroid --sysroot=#{SYSROOT}) + ARCH_CFLAGS - ANDROID_LDFLAGS = GCC_COMMON_LDFLAGS + %W(-mandroid --sysroot=#{SYSROOT}) + ARCH_LDFLAGS + ANDROID_CFLAGS = GCC_COMMON_CFLAGS + %W(-mandroid --sysroot="#{SYSROOT}") + ARCH_CFLAGS + ANDROID_LDFLAGS = GCC_COMMON_LDFLAGS + %W(-mandroid --sysroot="#{SYSROOT}") + ARCH_LDFLAGS when 'clang' then # clang is not supported yet. when 'clang31', 'clang3.1' then |