Backed out changeset 6fc0e4a3a9b0 (bug 1077549) for B2G device image build bustage. DONTBUILD
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 08 Jan 2015 21:28:37 -0500
changeset 248675 f87ebcbf7a2e4b29511a03b235ada9a4629f44b1
parent 248674 6fc0e4a3a9b0a71ff6e2176b76950e1eefade65c
child 248676 8d838801a16de5e235bfe42235d451d02f5866fc
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1077549
milestone37.0a1
backs out6fc0e4a3a9b0a71ff6e2176b76950e1eefade65c
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 6fc0e4a3a9b0 (bug 1077549) for B2G device image build bustage. DONTBUILD
b2g/confvars.sh
build/autoconf/toolchain.m4
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -54,16 +54,20 @@ 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 6 ||
+    if test "$GCC_MAJOR_VERSION" -eq 4 -a "$GCC_MINOR_VERSION" -lt 4 ||
        test "$GCC_MAJOR_VERSION" -lt 4; then
-        AC_MSG_ERROR([Only GCC 4.6 or newer supported])
+        AC_MSG_ERROR([Only GCC 4.4 or newer supported])
     fi
 fi
 ])
 
 AC_DEFUN([MOZ_CROSS_COMPILER],
 [
 echo "cross compiling from $host to $target"