Bug 1314678 - Do not include mozconfig.cache in cross-mozconfig.common. r=mshal draft
authorChris Manchester <cmanchester@mozilla.com>
Tue, 07 Mar 2017 10:21:33 -0800
changeset 494733 d01254a2140ad6fc90321c8a5d1f4c439e93f7b1
parent 494732 026e877d2e3370d405932107c0d5a7fe80281a67
child 494734 3944a7c98a6570bf0f30dc01a9d895cc07cc0ff1
push id48109
push userbmo:cmanchester@mozilla.com
push dateTue, 07 Mar 2017 18:21:57 +0000
reviewersmshal
bugs1314678
milestone55.0a1
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
build/macosx/cross-mozconfig.common
--- 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