Backed out changeset 6fc0e4a3a9b0 (bug 1077549) for B2G device image build bustage. DONTBUILD

This commit is contained in:
Ryan VanderMeulen 2015-01-08 21:28:37 -05:00
parent c17fa68a99
commit df536cedbe
2 changed files with 6 additions and 2 deletions

View File

@ -59,8 +59,12 @@ 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

View File

@ -101,9 +101,9 @@ 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
])