From a2a5c34c56259d39395213943d79f734ca705ccb Mon Sep 17 00:00:00 2001 From: crimsonwoods Date: Sun, 11 Oct 2015 17:25:48 +0900 Subject: Integrate common flag. --- tasks/toolchains/androidndk.rake | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/androidndk.rake index 2976e01ac..3b613022a 100644 --- a/tasks/toolchains/androidndk.rake +++ b/tasks/toolchains/androidndk.rake @@ -167,24 +167,12 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter flags = [] case toolchain when :gcc - flags = %W(-D__android__ -mandroid --sysroot="#{sysroot}") + flags = %W(-D__android__ -mandroid --sysroot="#{sysroot}" -no-canonical-prefixes) case arch - when /arm64/ - flags += %W(-no-canonical-prefixes) when 'armeabi-v7a-hard' - flags += %W(-no-canonical-prefixes -march=armv7-a -Wl,--fix-cortex-a8 -Wl,--no-warn-mismatch -lm_hard) + flags += %W(-march=armv7-a -Wl,--fix-cortex-a8 -Wl,--no-warn-mismatch -lm_hard) when 'armeabi-v7a' - flags += %W(-no-canonical-prefixes -march=armv7-a -Wl,--fix-cortex-a8) - when /armeabi/ - flags += %W(-no-canonical-prefixes) - when /mips64/ - flags += %W(-no-canonical-prefixes) - when /mips/ - flags += %W(-no-canonical-prefixes) - when /x86_64/ - flags += %W(-no-canonical-prefixes) - when /x86/ - flags += %W(-no-canonical-prefixes) + flags += %W(-march=armv7-a -Wl,--fix-cortex-a8) end end end -- cgit v1.2.3