diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-07-07 00:36:51 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-07-07 00:36:51 +0900 |
| commit | 5daabc940767d658e9017cf02c5d0e96fc29f7f7 (patch) | |
| tree | ae182ff575702051e2c8a8ba8f07083c1f96d44f | |
| parent | f1c6d6c8663272c0c2df39c65e68eda76c6b9327 (diff) | |
| parent | 0b50b4a5005c3233b88b09f196034352ebdfc515 (diff) | |
| download | mruby-5daabc940767d658e9017cf02c5d0e96fc29f7f7.tar.gz mruby-5daabc940767d658e9017cf02c5d0e96fc29f7f7.zip | |
Merge pull request #2876 from joans321/master
fix androideabi cross-compile error : undefined reference to 'frexpl'
| -rw-r--r-- | src/fmt_fp.c | 9 | ||||
| -rw-r--r-- | tasks/toolchains/androideabi.rake | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/fmt_fp.c b/src/fmt_fp.c index a634edb34..b467435a3 100644 --- a/src/fmt_fp.c +++ b/src/fmt_fp.c @@ -90,12 +90,9 @@ fmt_u(uint32_t x, char *s) typedef char compiler_defines_long_double_incorrectly[9-(int)sizeof(long double)]; #endif -#if (defined(__CYGWIN32__) || defined(__NetBSD__) || defined(mips)) && !defined(__linux__) -static long double -frexpl (long double x, int *eptr) -{ - return frexp(x, eptr); -} +#if ((defined(__CYGWIN32__) || defined(__NetBSD__) || defined(mips)) && !defined(__linux__)) || defined(__android__) +#undef frexpl +#define frexpl frexp #endif static int diff --git a/tasks/toolchains/androideabi.rake b/tasks/toolchains/androideabi.rake index 61881ca31..7cdb9e43a 100644 --- a/tasks/toolchains/androideabi.rake +++ b/tasks/toolchains/androideabi.rake @@ -109,8 +109,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(-D__android__ -mandroid --sysroot="#{SYSROOT}") + ARCH_CFLAGS + ANDROID_LDFLAGS = GCC_COMMON_LDFLAGS + %W(-D__android__ -mandroid --sysroot="#{SYSROOT}") + ARCH_LDFLAGS when 'clang' then # clang is not supported yet. when 'clang31', 'clang3.1' then |