Merge "Prevent Kati from seeing MAKEFLAGS"
diff --git a/core/ninja.mk b/core/ninja.mk
index 04efcc1..f3aa70e 100644
--- a/core/ninja.mk
+++ b/core/ninja.mk
@@ -123,6 +123,14 @@
NINJA_EXTRA_ARGS += -j$(NINJA_REMOTE_NUM_JOBS)
else
NINJA_MAKEPARALLEL := $(MAKEPARALLEL) --ninja
+
+# We never want Kati to see MAKEFLAGS, as forcefully overriding variables is
+# terrible. The variables in MAKEFLAGS are still available in the environment,
+# so if part of the build wants input from the user, it should be explicitly
+# checking for an environment variable or using ?=
+#
+# makeparallel already clears MAKEFLAGS, so it's not necessary in the GOMA case
+KATI_MAKEPARALLEL := MAKEFLAGS=
endif
NINJA_ARGS += $(NINJA_EXTRA_ARGS)