Bug 1343713 - Avoid mozconfig failure when sccache is not there. r?ted draft
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 01 Mar 2017 11:06:40 +0900
changeset 491660 1b6440e59642a7de922a02b0fde6707650efd2fd
parent 491654 e77029e048140ddfc860b422ec34a03a8d411b16
child 491661 56f4e781211cc1c0e2a57beee7af83f0406bf677
push id47370
push userbmo:mh+mozilla@glandium.org
push dateThu, 02 Mar 2017 01:24:32 +0000
reviewersted
bugs1343713
milestone54.0a1
Bug 1343713 - Avoid mozconfig failure when sccache is not there. r?ted The build will fail during configure anyways in that case, not silently fallback to compiling without it.
build/mozconfig.cache
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@@ -103,20 +103,16 @@ fi
 
 if test -z "$bucket"; then
     case "$platform" in
     win*) : ;;
     *)
         ac_add_options --with-ccache
     esac
 else
-    if ! test -e $topsrcdir/sccache2/sccache${suffix}; then
-        echo "sccache2 missing in the tooltool manifest" >&2
-        exit 1
-    fi
     mk_add_options "export SCCACHE_BUCKET=$bucket"
     case "$master" in
     *us[ew][12].mozilla.com*|*euc1.mozilla.com*)
         mk_add_options "export SCCACHE_NAMESERVER=169.254.169.253"
         ;;
     esac
     ac_add_options "--with-ccache=$topsrcdir/sccache2/sccache${suffix}"
     export SCCACHE_VERBOSE_STATS=1