Port Bug 1007010 - Don't include mozconfig.cache twice in android debug mozconfigs. rs=bustage
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 08 May 2014 11:02:59 -0400
changeset 20094 4fc074034d477ecc5e32080cda723642c94fa79d
parent 20093 da34b03c7e5718d4f1d10487d100dafc1d33d266
child 20095 27968692278f363fb3fef3fd13bb1b065036a098
push id1179
push userCallek@gmail.com
push dateMon, 21 Jul 2014 20:52:37 +0000
treeherdercomm-beta@84d8ef10a503 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1007010
Port Bug 1007010 - Don't include mozconfig.cache twice in android debug mozconfigs. rs=bustage
build/mozconfig.cache
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@@ -1,14 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Setup for build cache
 
+# Avoid duplication if the file happens to be included twice.
+if test -z "$bucket"; then
+
 read branch platform master <<EOF
 $(python2.7 -c 'import json; p = json.loads(open("'"$topsrcdir"'/../buildprops.json").read())["properties"]; print p["branch"], p["platform"], p["master"]' 2> /dev/null)
 EOF
 
 bucket=
 if test -z "$SCCACHE_DISABLE" -a -z "$no_sccache"; then
     case "${branch}_${master}" in
     try_*scl1.mozilla.com*|try_*.scl3.mozilla.com*)
@@ -57,8 +60,10 @@ else
         # For now, sccache doesn't support separate PDBs so force debug info to be
         # in object files.
         mk_add_options "export COMPILE_PDB_FLAG="
         mk_add_options "export HOST_PDB_FLAG="
         mk_add_options "export MOZ_DEBUG_FLAGS=-Z7"
         ;;
     esac
 fi
+
+fi