Bug 1295811 - Check COMPILE_ENVIRONMENT instead of SKIP_COMPILER_CHECKS; r=glandium
authorGregory Szorc <gps@mozilla.com>
Wed, 17 Aug 2016 13:54:22 -0700
changeset 310098 46132442a61f61af64ebb0234392d51379fa40d4
parent 310097 d8af9d2ff42176357eea8922ff7fe9ec82459d65
child 310099 cd144a0012a5d8ce1626c3f47d3eac262a6e3a82
push id80771
push userkwierso@gmail.com
push dateThu, 18 Aug 2016 23:33:08 +0000
treeherdermozilla-inbound@cb1295738c37 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1295811
milestone51.0a1
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
Bug 1295811 - Check COMPILE_ENVIRONMENT instead of SKIP_COMPILER_CHECKS; r=glandium Reviewed over pastebin+irc, like a boss.
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -2051,20 +2051,22 @@ AC_CACHE_CHECK(for LC_MESSAGES,
                                ac_cv_i18n_lc_messages=yes,
                                ac_cv_i18n_lc_messages=no)])
 if test "$ac_cv_i18n_lc_messages" = yes; then
    AC_DEFINE(HAVE_I18N_LC_MESSAGES)
 fi
 
 AC_HAVE_FUNCS(localeconv)
 
-MOZ_CHECK_ALLOCATOR
-
 fi # ! SKIP_COMPILER_CHECKS
 
+if test -n "${COMPILE_ENVIRONMENT}"; then
+  MOZ_CHECK_ALLOCATOR
+fi
+
 TARGET_XPCOM_ABI=
 if test -n "${CPU_ARCH}" -a -n "${TARGET_COMPILER_ABI}"; then
     TARGET_XPCOM_ABI="${CPU_ARCH}-${TARGET_COMPILER_ABI}"
     AC_DEFINE_UNQUOTED(TARGET_XPCOM_ABI, ["${TARGET_XPCOM_ABI}"])
 fi
 
 dnl We can't run TRY_COMPILE tests on Windows, so hard-code some
 dnl features that Windows actually does support.