From 83caa2d8dcc6167152b193659f2d85312252adb1 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 23 Nov 2022 20:38:52 +0000 Subject: [PATCH] Bug 1802075 - Avoid calling "--stop-server" as a command on local build failure. r=firefox-build-system-reviewers,andi Differential Revision: https://phabricator.services.mozilla.com/D162814 --- client.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client.mk b/client.mk index 4c18b1cfd658..04fe5161ed87 100644 --- a/client.mk +++ b/client.mk @@ -32,6 +32,7 @@ endif MOZ_MAKE = $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR) +ifdef MOZBUILD_MANAGE_SCCACHE_DAEMON # In automation, manage an sccache daemon. The starting of the server # needs to be in a make file so sccache inherits the jobserver. SCCACHE_STOP = $(MOZBUILD_MANAGE_SCCACHE_DAEMON) --stop-server @@ -42,6 +43,7 @@ SCCACHE_STOP = $(MOZBUILD_MANAGE_SCCACHE_DAEMON) --stop-server # However, we also need to preserve the command's exit code, thus the # gymnastics. SCCACHE_STOP_ON_FAILURE = || (x=$$?; $(SCCACHE_STOP) || true; exit $$x) +endif # The default rule is build build: