Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set." am: 766c348748

am: 4d5f3043a2 Change-Id: I1cb95bee90e922a74d121f0ed78dc08953cfa735
2016-09-15 03:53:43 +00:00 · 2016-09-15 03:53:43 +00:00 · 57e615605c
parent 74a9e76175 4d5f3043a2
commit 57e615605c
1 changed files with 3 additions and 1 deletions
--- 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 :=