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

2016-09-15 03:41:24 +00:00
parent 029ced528b a2ca270502
commit 766c348748
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 :=