diff options
| author | Seba Gamboa <[email protected]> | 2015-07-22 21:57:20 -0300 |
|---|---|---|
| committer | Seba Gamboa <[email protected]> | 2015-07-22 21:57:20 -0300 |
| commit | f01704477fd420839e002875e146a58a3af91c73 (patch) | |
| tree | 6924afa16591cd5f0caea8529063a764294b120e /tasks/toolchains | |
| parent | 0f5386db2eb5d981888f8b78cedc46f91447dae0 (diff) | |
| download | mruby-f01704477fd420839e002875e146a58a3af91c73.tar.gz mruby-f01704477fd420839e002875e146a58a3af91c73.zip | |
Add ability to change compiler versions for androideabi
Diffstat (limited to 'tasks/toolchains')
| -rw-r--r-- | tasks/toolchains/androideabi.rake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tasks/toolchains/androideabi.rake b/tasks/toolchains/androideabi.rake index 7cdb9e43a..d2d5dcec4 100644 --- a/tasks/toolchains/androideabi.rake +++ b/tasks/toolchains/androideabi.rake @@ -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 |