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

Merge pull request #2896 from sagmor/custom-gcc-version

Browse Source 
Add ability to change compiler versions for androideabi
This commit is contained in:
Yukihiro "Matz" Matsumoto
2015-07-23 14:41:53 +09:00
parent 0f5386db2e f01704477f
commit 156dd27f88
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tasks/toolchains/androideabi.rake
+4 -2
View File
@@ -27,6 +27,8 @@ MRuby::Toolchain.new(:androideabi) do |conf|
ANDROID_TARGET_ARCH = ENV['ANDROID_TARGET_ARCH'] || DEFAULT_ANDROID_TARGET_ARCH
ANDROID_TARGET_ARCH_ABI = ENV['ANDROID_TARGET_ARCH_ABI'] || DEFAULT_ANDROID_TARGET_ARCH_ABI
ANDROID_TOOLCHAIN = ENV['ANDROID_TOOLCHAIN'] || DEFAULT_ANDROID_TOOLCHAIN
GCC_VERSION = ENV['GCC_VERSION'] || GCC_VERSION
CLANG_VERSION = ENV['CLANG_VERSION'] || CLANG_VERSION
case ANDROID_TARGET_ARCH.downcase
when 'arch-arm', 'arm' then
@@ -74,9 +76,9 @@ MRuby::Toolchain.new(:androideabi) do |conf|
else
# Any other architecture are not supported by Android NDK.
end
path_to_toolchain += DEFAULT_GCC_VERSION + '/prebuilt/' + HOST_PLATFORM
path_to_toolchain += GCC_VERSION + '/prebuilt/' + HOST_PLATFORM
else
path_to_toolchain += 'llvm-' + DEFAULT_CLANG_VERSION + '/prebuilt/' + HOST_PLATFORM
path_to_toolchain += 'llvm-' + CLANG_VERSION + '/prebuilt/' + HOST_PLATFORM
end
else
path_to_toolchain = ANDROID_STANDALONE_TOOLCHAIN