diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-07-26 21:08:24 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-07-26 21:08:24 +0900 |
| commit | c9168341bfa1380a179984049da8b279fe5563d6 (patch) | |
| tree | a77fc88d5edec133c27cfd38fe3e0e291ddbb4f0 /tasks | |
| parent | 156dd27f88bec8cbf115618050928b40b8720e9d (diff) | |
| parent | 007d26f168689f785be9ddf97cc5293ad534a4c7 (diff) | |
| download | mruby-c9168341bfa1380a179984049da8b279fe5563d6.tar.gz mruby-c9168341bfa1380a179984049da8b279fe5563d6.zip | |
Merge pull request #2897 from joans321/fix-android-gcc-version
fix android compile bug : uninitialized constant GCC_VERSION
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/toolchains/androideabi.rake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tasks/toolchains/androideabi.rake b/tasks/toolchains/androideabi.rake index d2d5dcec4..272e802f7 100644 --- a/tasks/toolchains/androideabi.rake +++ b/tasks/toolchains/androideabi.rake @@ -27,8 +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 + GCC_VERSION = ENV['GCC_VERSION'] || DEFAULT_GCC_VERSION + CLANG_VERSION = ENV['CLANG_VERSION'] || DEFAULT_CLANG_VERSION case ANDROID_TARGET_ARCH.downcase when 'arch-arm', 'arm' then |
