Skip to content

M
mruby
Commit bb63eb04 authored by crimsonwoods's avatar crimsonwoods
Browse files
Options

bug fix: fix "--sysroot" option and host platform detection.

parent 887ebb8c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
tasks/toolchains/androideabi.rake
View file @ bb63eb04
...@@ -43,9 +43,9 @@ MRuby::Toolchain.new(:androideabi) do |conf| ...@@ -43,9 +43,9 @@ MRuby::Toolchain.new(:androideabi) do |conf|
if ANDROID_STANDALONE_TOOLCHAIN == nil then if ANDROID_STANDALONE_TOOLCHAIN == nil then
if RUBY_PLATFORM.include?('darwin') then if RUBY_PLATFORM.include?('darwin') then
HOST_PLATFORM = 'darwin-x86' HOST_PLATFORM = 'darwin-x86'
elsif RUBY_PLATFORM.include('linux') then elsif RUBY_PLATFORM.include?('linux') then
HOST_PLATFORM = 'linux-x86' HOST_PLATFORM = 'linux-x86'
elsif RUBY_PLATFORM.include('win') then elsif RUBY_PLATFORM.include?('win') then
HOST_PLATFORM = 'windows' HOST_PLATFORM = 'windows'
else else
# Unknown host platform. # Unknown host platform.
...@@ -104,8 +104,8 @@ MRuby::Toolchain.new(:androideabi) do |conf| ...@@ -104,8 +104,8 @@ MRuby::Toolchain.new(:androideabi) do |conf|
ANDROID_CC = path_to_toolchain + '/bin/' + toolchain_prefix + 'gcc' ANDROID_CC = path_to_toolchain + '/bin/' + toolchain_prefix + 'gcc'
ANDROID_LD = 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_AR = path_to_toolchain + '/bin/' + toolchain_prefix + 'ar'
ANDROID_CFLAGS = GCC_COMMON_CFLAGS + %W(-mandroid --sysroot=#{SYSROOT}) + ARCH_CFLAGS ANDROID_CFLAGS = GCC_COMMON_CFLAGS + %W(-mandroid --sysroot="#{SYSROOT}") + ARCH_CFLAGS
ANDROID_LDFLAGS = GCC_COMMON_LDFLAGS + %W(-mandroid --sysroot=#{SYSROOT}) + ARCH_LDFLAGS ANDROID_LDFLAGS = GCC_COMMON_LDFLAGS + %W(-mandroid --sysroot="#{SYSROOT}") + ARCH_LDFLAGS
when 'clang' then when 'clang' then
# clang is not supported yet. # clang is not supported yet.
when 'clang31', 'clang3.1' then when 'clang31', 'clang3.1' then
......
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