Merge pull request #95 from mapbox/soft-float

Use soft float on Android ARM
mapbox · May 29, 2015 · abdc131 · abdc131
2 parents ace19da + 22baad7
commit abdc131
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mason.sh b/mason.sh
@@ -116,8 +116,8 @@ elif [ ${MASON_PLATFORM} = 'android' ]; then
         MASON_ANDROID_CROSS_COMPILER="arm-linux-androideabi-4.9"
         export MASON_HOST_ARG="--host=${MASON_ANDROID_TOOLCHAIN}"
 
-        export CFLAGS="-target armv7-none-linux-androideabi -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -D_LITTLE_ENDIAN ${CFLAGS}"
-        export LDFLAGS="-target armv7-none-linux-androideabi -march=armv7-a -Wl,--fix-cortex-a8 -Wl,--no-warn-mismatch -lm_hard  -fuse-ld=gold ${LDFLAGS}"
+        export CFLAGS="-target armv7-none-linux-androideabi -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp -D_LITTLE_ENDIAN ${CFLAGS}"
+        export LDFLAGS="-target armv7-none-linux-androideabi -march=armv7-a -Wl,--fix-cortex-a8 -fuse-ld=gold ${LDFLAGS}"
 
         export JNIDIR="armeabi-v7a"
         MASON_ANDROID_ARCH="arm"