Merge "Make multiple rules to generate a file an error"

This commit is contained in:
Dan Willemsen
2016-02-27 05:12:28 +00:00
committed by Gerrit Code Review

View File

@@ -116,6 +116,10 @@ ifneq (,$(filter showcommands,$(ORIGINAL_MAKECMDGOALS)))
NINJA_ARGS += "-v" NINJA_ARGS += "-v"
endif endif
# Make multiple rules to generate the same target an error instead of
# proceeding with undefined behavior.
NINJA_ARGS += -w dupbuild=err
ifdef USE_GOMA ifdef USE_GOMA
KATI_MAKEPARALLEL := $(MAKEPARALLEL) KATI_MAKEPARALLEL := $(MAKEPARALLEL)
# Ninja runs remote jobs (i.e., commands which contain gomacc) with # Ninja runs remote jobs (i.e., commands which contain gomacc) with