Bug 1262052 - Remove unnecessary -mandroid parameter. r?glandium draft
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 20 May 2016 18:12:14 +0900
changeset 375062 2fc4ec1361849018bfd974dc6c3090943a2cdd3f
parent 375054 e27fe24a746fa839f1cabe198faf1bad42c7dc4b
child 522751 635e26922ed48a876aeb49435fc63b0f2d83f31b
push id20154
push userm_kato@ga2.so-net.ne.jp
push dateFri, 03 Jun 2016 10:43:17 +0000
reviewersglandium
bugs1262052
milestone49.0a1
Bug 1262052 - Remove unnecessary -mandroid parameter. r?glandium When target is Android, -mandroid is default parameter from gcc 4.6 So we don't need add this options. Also clang doesn't support this argument. MozReview-Commit-ID: AuA3Y9vlgWE
build/autoconf/android.m4
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -43,25 +43,25 @@ case "$target" in
 
     if test -d "$android_platform" ; then
         AC_MSG_RESULT([$android_platform])
     else
         AC_MSG_ERROR([not found. Please check your NDK. With the current configuration, it should be in $android_platform])
     fi
 
     CPPFLAGS="-idirafter $android_platform/usr/include $CPPFLAGS"
-    CFLAGS="-mandroid -fno-short-enums -fno-exceptions $CFLAGS"
-    CXXFLAGS="-mandroid -fno-short-enums -fno-exceptions $CXXFLAGS"
+    CFLAGS="-fno-short-enums -fno-exceptions $CFLAGS"
+    CXXFLAGS="-fno-short-enums -fno-exceptions $CXXFLAGS"
     ASFLAGS="-idirafter $android_platform/usr/include -DANDROID $ASFLAGS"
 
     dnl Add -llog by default, since we use it all over the place.
     dnl Add --allow-shlib-undefined, because libGLESv2 links to an
     dnl undefined symbol (present on the hardware, just not in the
     dnl NDK.)
-    LDFLAGS="-mandroid -L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform -llog -Wl,--allow-shlib-undefined $LDFLAGS"
+    LDFLAGS="-L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform -llog -Wl,--allow-shlib-undefined $LDFLAGS"
     ANDROID_PLATFORM="${android_platform}"
 
     AC_DEFINE(ANDROID)
     AC_SUBST(ANDROID_PLATFORM)
 
     ;;
 esac