commit 23e4ab2edf7e158b970cd3837363a41f83b77938
author Martin Stjernholm <mast@google.com> Thu Jan 14 10:36:25 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 14 10:36:25 2021 +0000
tree 443a74c79dc9bbf4514c2eebfc23804642026df7
parent 0c6951f829140d4e4fe3fd876684ee5ed32997b4
parent 3839f03b7d4eda7641497fc978a255cd50778320

Merge "Add check that a module doesn't try to override itself."

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index e68650d..09105d9 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1120,7 +1120,11 @@
 # Expand a list of modules to the modules that they override (if any)
 # $(1): The list of modules.
 define module-overrides
-$(foreach m,$(1),$(PACKAGES.$(m).OVERRIDES) $(EXECUTABLES.$(m).OVERRIDES) $(SHARED_LIBRARIES.$(m).OVERRIDES) $(ETC.$(m).OVERRIDES))
+$(foreach m,$(1),\
+  $(eval _mo_overrides := $(PACKAGES.$(m).OVERRIDES) $(EXECUTABLES.$(m).OVERRIDES) $(SHARED_LIBRARIES.$(m).OVERRIDES) $(ETC.$(m).OVERRIDES))\
+  $(if $(filter $(m),$(_mo_overrides)),\
+    $(error Module $(m) cannot override itself),\
+    $(_mo_overrides)))
 endef
 
 ###########################################################