--- 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