Bug 1412057 - Do not attempt to enable the clang plugin in mozconfigs during artifact builds on try. r=nalexander
authorChris Manchester <cmanchester@mozilla.com>
Thu, 26 Oct 2017 13:04:54 -0700
changeset 388509 fac604a5abafd6074ba5fd5fc22fb0eee1fa4c6f
parent 388508 4235b95666453a7d53afa8cc88c3d27765f82933
child 388510 e5caf5ea90a0ebf307f87fd7d6287b090c30f396
push id32753
push userarchaeopteryx@coole-files.de
push dateFri, 27 Oct 2017 09:43:22 +0000
treeherdermozilla-central@d9613617f268 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1412057
milestone58.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 1412057 - Do not attempt to enable the clang plugin in mozconfigs during artifact builds on try. r=nalexander MozReview-Commit-ID: HSEdJeYbCeC
build/macosx/cross-mozconfig.common
build/mozconfig.artifact.automation
--- a/build/macosx/cross-mozconfig.common
+++ b/build/macosx/cross-mozconfig.common
@@ -41,15 +41,16 @@ export HOST_CXX="$topsrcdir/clang/bin/cl
 export HOST_CPP="$topsrcdir/clang/bin/clang -E"
 export HOST_CFLAGS="-g"
 export HOST_CXXFLAGS="-g"
 export HOST_LDFLAGS="-g"
 
 ac_add_options --target=x86_64-apple-darwin
 ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS
 
-if [ "x$MOZ_PKG_SPECIAL" != "xasan" ]; then
+if [ "x$MOZ_PKG_SPECIAL" != "xasan" -a -z "$MOZ_AUTOMATION_ARTIFACT_BUILDS" ]; then
   # Enable static analysis checks by default on OSX cross builds.
   # Exception is ASan, where this breaks.
+  # The option is not valid on artifact builds, so don't add it there either.
   ac_add_options --enable-clang-plugin
 fi
 
 export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
--- a/build/mozconfig.artifact.automation
+++ b/build/mozconfig.artifact.automation
@@ -1,6 +1,7 @@
 # Common options for artifact builds to set automation steps.
 # This gets included before mozconfig.automation.
 
 MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0
+MOZ_AUTOMATION_ARTIFACT_BUILDS=1