From d8f268ecac3a689ed3cadf51234f64f0721ca9b9 Mon Sep 17 00:00:00 2001 From: Shinichiro Hamaji Date: Thu, 24 Sep 2015 15:19:08 +0900 Subject: [PATCH] Allow USE_GOMA=true without explicit USE_NINJA=true Now ninja build is disabled only with USE_NINJA=false. So goma.mk should fail with an error only when USE_NINJA=false is explicitly specified. Change-Id: I2fb913433d5c1e93ed2a9bd93bb5000cabd835a4 --- core/goma.mk | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/core/goma.mk b/core/goma.mk index 1d44aea93..5b5830c41 100644 --- a/core/goma.mk +++ b/core/goma.mk @@ -16,13 +16,14 @@ # Notice: this works only with Google's Goma build infrastructure. ifneq ($(USE_GOMA),) - # Check if USE_NINJA is defined because GNU make won't work well - # with goma. Note this file is evaluated twice, once with - # USE_NINJA=true by GNU make and once with USE_NINJA=false by kati - # which is invoked by GNU make. So, we cannot test the value of - # USE_NINJA. - ifndef USE_NINJA - $(error USE_GOMA=true works only with USE_NINJA=true) + # Check if USE_NINJA is not false because GNU make won't work well + # with goma. Note this file is evaluated twice, once by GNU make and + # once by kati with USE_NINJA=false. We do this check in the former + # pass. + ifndef KATI + ifeq ($(USE_NINJA),false) + $(error USE_GOMA=true is not compatible with USE_NINJA=false) + endif endif ifdef GOMA_DIR -- 2.11.0