Keep build/mozconfig.cache in sync: [Bug 1304998 - enable tc win pgo] rs=bustage-fix DONTBUILD
authorRichard Marti <richard.marti@gmail.com>
Fri, 30 Sep 2016 14:57:29 +0200
changeset 26575 84225b9a4451c16987eea30296d0aaaf47fe52b1
parent 26574 907ba80124fe9638e436f824e7f4aa11cb5198b5
child 26576 bc84637f93882097abfe75db5d02cbef034ab24e
push id1834
push userclokep@gmail.com
push dateMon, 23 Jan 2017 21:48:40 +0000
treeherdercomm-beta@293cffe83e59 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1304998
Keep build/mozconfig.cache in sync: [Bug 1304998 - enable tc win pgo] rs=bustage-fix DONTBUILD
build/mozconfig.cache
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@@ -77,18 +77,21 @@ elif test -z "$CCACHE_DIR" -a -z "$SCCAC
                 master=dummy.usw1.mozilla.com
                 ;;
             us-west-2)
                 master=dummy.usw2.mozilla.com
                 ;;
             esac
         fi
     fi
+fi
 
-
+# if platform hasn't been determined from buildprops, and we're on windows,
+# it must be set to prevent adding ac_add_options --with-ccache below
+if test -z "$platform"; then
     # set platform based on the SYSTEMROOT env var
     case "${SYSTEMROOT}" in
     *Windows)
         platform=windows
         ;;
     esac
 fi