Keep build files in sync (Port Bug 1412057: Do not attempt to enable the clang plugin in mozconfigs during artifact builds on try). rs=bustage-fix
authorTom Prince <mozilla@hocat.ca>
Sat, 28 Oct 2017 00:06:42 -0600
changeset 22441 6cc4bfb28c66857cb5140781787d280e13fd98cb
parent 22440 06612f10c21aebaedfde55157310e6879d79c521
child 22442 8d4167a5c1e0d138e6878eda9a74e770ce91d03d
push id13679
push usermozilla@jorgk.com
push dateSat, 28 Oct 2017 09:35:49 +0000
treeherdercomm-central@8d4167a5c1e0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1412057
Keep build files in sync (Port Bug 1412057: Do not attempt to enable the clang plugin in mozconfigs during artifact builds on try). rs=bustage-fix MozReview-Commit-ID: 9kufAHwSHKs
build/macosx/cross-mozconfig.common
--- 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