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 #2876 from joans321/master

Browse Source 
fix androideabi cross-compile error : undefined reference to 'frexpl'
This commit is contained in:
Yukihiro "Matz" Matsumoto
2015-07-07 00:36:51 +09:00
parent f1c6d6c866 0b50b4a500
commit 5daabc9407
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fmt_fp.c
+3 -6
View File
@@ -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
tasks/toolchains/androideabi.rake
+2 -2
View File
@@ -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