Bug 1077549 - Only support gcc 4.6+. r=glandium
authorTrevor Saunders <trev.saunders@gmail.com>
Thu, 08 Jan 2015 20:21:37 -0500
changeset 236188 286e1f883fdbd7cc571a73b2538eb69cb126d845
parent 236187 edf081cb3abf0746eb1d5767edf167ef7d4c9bea
child 236189 2d86fd281b69782c5e7e318f4bbd072cc7d6bb4f
push id391
push usermcmanus@ducksong.com
push dateMon, 12 Jan 2015 18:26:35 +0000
reviewersglandium
bugs1077549
milestone37.0a1
Bug 1077549 - Only support gcc 4.6+. r=glandium
b2g/confvars.sh
build/autoconf/toolchain.m4
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -54,20 +54,16 @@ MOZ_TIME_MANAGER=1
 MOZ_PAY=1
 MOZ_TOOLKIT_SEARCH=
 MOZ_PLACES=
 MOZ_B2G=1
 
 if test "$OS_TARGET" = "Android"; then
 MOZ_NUWA_PROCESS=1
 MOZ_B2G_LOADER=1
-# Warnings-as-errors cannot be enabled on gcc <= 4.4 due to bug 915555.
-if test "$GCC_MAJOR_VERSION" -gt 4 -o \
-   "$GCC_MAJOR_VERSION" -eq 4 -a "$GCC_MINOR_VERSION" -gt 4; then
 MOZ_ENABLE_WARNINGS_AS_ERRORS=1
 fi
-fi
 
 MOZ_JSDOWNLOADS=1
 
 MOZ_BUNDLED_FONTS=1
 
 export JS_GC_SMALL_CHUNK_SIZE=1
--- a/build/autoconf/toolchain.m4
+++ b/build/autoconf/toolchain.m4
@@ -96,19 +96,19 @@ if test "$GNU_CC"; then
         GCC_USE_GNU_LD=1
     fi
 fi
 
 AC_SUBST(CLANG_CXX)
 AC_SUBST(CLANG_CL)
 
 if test -n "$GNU_CC" -a -z "$CLANG_CC" ; then
-    if test "$GCC_MAJOR_VERSION" -eq 4 -a "$GCC_MINOR_VERSION" -lt 4 ||
+    if test "$GCC_MAJOR_VERSION" -eq 4 -a "$GCC_MINOR_VERSION" -lt 6 ||
        test "$GCC_MAJOR_VERSION" -lt 4; then
-        AC_MSG_ERROR([Only GCC 4.4 or newer supported])
+        AC_MSG_ERROR([Only GCC 4.6 or newer supported])
     fi
 fi
 ])
 
 AC_DEFUN([MOZ_CROSS_COMPILER],
 [
 echo "cross compiling from $host to $target"