Bug 1314678 - Don't perform clang plugin checks in artifact builds. r=mshal draft
authorChris Manchester <cmanchester@mozilla.com>
Fri, 03 Mar 2017 14:18:21 -0800
changeset 493406 0414463110a8b23e3d0b48f460177e99f4352115
parent 493405 1ff853060f188e67b50f44d9dad7377e4ff15bb4
child 493407 88cf978106d15426d0b44ac607502a2d5a474c5b
push id47752
push usercmanchester@mozilla.com
push dateFri, 03 Mar 2017 22:19:04 +0000
reviewersmshal
bugs1314678
milestone54.0a1
Bug 1314678 - Don't perform clang plugin checks in artifact builds. r=mshal Until we have the ability to properly make these flags conditional in moz.configure, do not perform these checks. MozReview-Commit-ID: CexvgiadIw0
js/src/old-configure.in
old-configure.in
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1730,17 +1730,19 @@ MOZ_ARG_ENABLE_BOOL(oom-breakpoint,
 if test -n "$JS_OOM_BREAKPOINT"; then
     AC_DEFINE(JS_OOM_BREAKPOINT)
 fi
 
 dnl ========================================================
 dnl = Enable using the clang plugin to build
 dnl ========================================================
 
+if test -n "$COMPILE_ENVIRONMENT"; then
 MOZ_CONFIG_CLANG_PLUGIN
+fi # COMPILE_ENVIRONMENT
 
 dnl ========================================================
 dnl = Enable static checking using sixgill
 dnl ========================================================
 
 MOZ_ARG_WITH_STRING(sixgill,
 [  --with-sixgill=path/to/sixgill
                           Enable static checking of code using sixgill],
--- a/old-configure.in
+++ b/old-configure.in
@@ -4275,17 +4275,19 @@ fi
 
 AC_SUBST_LIST(MOZ_GLUE_WRAP_LDFLAGS)
 export MOZ_GLUE_WRAP_LDFLAGS
 
 dnl ========================================================
 dnl = Enable using the clang plugin to build
 dnl ========================================================
 
+if test -n "$COMPILE_ENVIRONMENT"; then
 MOZ_CONFIG_CLANG_PLUGIN
+fi # COMPILE_ENVIRONMENT
 
 dnl ========================================================
 dnl = Enable stripping of libs & executables
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(strip,
 [  --enable-strip          Enable stripping of libs & executables ],
     ENABLE_STRIP=1,
     ENABLE_STRIP= )