Bug 1314678 - Do not include mozconfig.cache in cross-mozconfig.common. r=mshal
It's already included by the nightly and debug mozconfigs which end up including
cross-mozconfig.common, including it again appears ineffectual and causes
failures in artifact builds.
MozReview-Commit-ID: 1DH4r8mgNXe
--- a/build/macosx/cross-mozconfig.common
+++ b/build/macosx/cross-mozconfig.common
@@ -46,11 +46,9 @@ ac_add_options --target=x86_64-apple-dar
ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS
if [ "x$MOZ_PKG_SPECIAL" != "xasan" ]; then
# Enable static analysis checks by default on OSX cross builds.
# Exception is ASan, where this breaks.
ac_add_options --enable-clang-plugin
fi
-. "$topsrcdir/build/mozconfig.cache"
-
export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token