Bug 1165460 - Prefer GCC 4.9 for Fennec builds r=glandium
authorJames Willcox <snorp@snorp.net>
Tue, 19 May 2015 14:22:27 -0500
changeset 269693 4a75e9c53b6c70dcf1942db2d932e51e194e654e
parent 269692 bd1087d6cff9eacc9dadf0a275dd7b1f3d802aaf
child 269694 442bd6f785cd148976490a98378064c04751f3ba
push id2540
push userwcosta@mozilla.com
push dateWed, 03 Jun 2015 20:55:41 +0000
reviewersglandium
bugs1165460
milestone41.0a1
Bug 1165460 - Prefer GCC 4.9 for Fennec builds r=glandium
build/autoconf/android.m4
mobile/android/config/mozconfigs/common
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -59,17 +59,17 @@ case "$target" in
         AC_MSG_ERROR([You must specify --with-android-ndk=/path/to/ndk when targeting Android.])
     fi
 
     if test -z "$android_toolchain" ; then
         AC_MSG_CHECKING([for android toolchain directory])
 
         kernel_name=`uname -s | tr "[[:upper:]]" "[[:lower:]]"`
 
-        for version in $android_gnu_compiler_version 4.8 4.7 4.6 4.4.3; do
+        for version in $android_gnu_compiler_version 4.9 4.8 4.7 4.6 4.4.3; do
             case "$target_cpu" in
             arm)
                 target_name=arm-linux-androideabi-$version
                 ;;
             i?86)
                 target_name=x86-$version
                 ;;
             mipsel)
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -24,17 +24,17 @@ ac_add_options --enable-application=mobi
 if test `uname -m` = 'x86_64'; then
   ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
   ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux/platforms/android-$ANDROID_SDK_VERSION"
 else
   ac_add_options --with-android-ndk="/tools/android-ndk-$ANDROID_NDK_VERSION_32BIT"
   ac_add_options --with-android-sdk="/tools/android-sdk-r$ANDROID_SDK_VERSION/platforms/android-$ANDROID_SDK_VERSION"
 fi
 
-ac_add_options --with-android-gnu-compiler-version=4.7
+ac_add_options --with-android-gnu-compiler-version=4.9
 ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
 ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-fennec-geoloc-api.key