Skip to content

M
mruby
Commit 0b50b4a5 authored by xuejianqing's avatar xuejianqing
Browse files
Options

fix androideabi cross-compile error : undefined reference to 'frexpl'

parent e690e1e8
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 8 deletions
src/fmt_fp.c
View file @ 0b50b4a5
...@@ -90,12 +90,9 @@ fmt_u(uint32_t x, char *s) ...@@ -90,12 +90,9 @@ fmt_u(uint32_t x, char *s)
typedef char compiler_defines_long_double_incorrectly[9-(int)sizeof(long double)]; typedef char compiler_defines_long_double_incorrectly[9-(int)sizeof(long double)];
#endif #endif
#if (defined(__CYGWIN32__) || defined(__NetBSD__) || defined(mips)) && !defined(__linux__) #if ((defined(__CYGWIN32__) || defined(__NetBSD__) || defined(mips)) && !defined(__linux__)) || defined(__android__)
static long double #undef frexpl
frexpl (long double x, int *eptr) #define frexpl frexp
{
return frexp(x, eptr);
}
#endif #endif
static int static int
......
tasks/toolchains/androideabi.rake
View file @ 0b50b4a5
...@@ -109,8 +109,8 @@ MRuby::Toolchain.new(:androideabi) do |conf| ...@@ -109,8 +109,8 @@ MRuby::Toolchain.new(:androideabi) do |conf|
ANDROID_CC = path_to_toolchain + '/bin/' + toolchain_prefix + 'gcc' ANDROID_CC = path_to_toolchain + '/bin/' + toolchain_prefix + 'gcc'
ANDROID_LD = 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_AR = path_to_toolchain + '/bin/' + toolchain_prefix + 'ar'
ANDROID_CFLAGS = GCC_COMMON_CFLAGS + %W(-mandroid --sysroot="#{SYSROOT}") + ARCH_CFLAGS ANDROID_CFLAGS = GCC_COMMON_CFLAGS + %W(-D__android__ -mandroid --sysroot="#{SYSROOT}") + ARCH_CFLAGS
ANDROID_LDFLAGS = GCC_COMMON_LDFLAGS + %W(-mandroid --sysroot="#{SYSROOT}") + ARCH_LDFLAGS ANDROID_LDFLAGS = GCC_COMMON_LDFLAGS + %W(-D__android__ -mandroid --sysroot="#{SYSROOT}") + ARCH_LDFLAGS
when 'clang' then when 'clang' then
# clang is not supported yet. # clang is not supported yet.
when 'clang31', 'clang3.1' then when 'clang31', 'clang3.1' then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment