From a2ca2705023c7ac0bcbd4979da45c2d9f5687888 Mon Sep 17 00:00:00 2001
From: Yoshisato Yanagisawa <yyanagisawa@google.com>
Date: Tue, 13 Sep 2016 12:53:08 +0900
Subject: [PATCH] goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is
 set.

During the development of goma client, we sometimes need to use goma
compiler_proxy, which has already been running.

Test: NOSTART_GOMA=1 USE_GOMA=1 m.

Change-Id: Ifa969c40871325fd43ee6443ddbe3b18fde62c5a
---
 core/goma.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/goma.mk b/core/goma.mk
index 52726bee6..4e8318a7f 100644
--- a/core/goma.mk
+++ b/core/goma.mk
@@ -49,7 +49,9 @@ ifneq ($(filter-out false,$(USE_GOMA)),)
   # gomacc can start goma client's daemon process automatically, but
   # it is safer and faster to start up it beforehand. We run this as a
   # background process so this won't slow down the build.
-  $(shell ( $(goma_ctl) ensure_start ) &> /dev/null &)
+  ifndef NOSTART_GOMA
+    $(shell ( $(goma_ctl) ensure_start ) &> /dev/null &)
+  endif
 
   goma_ctl :=
   goma_dir :=