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

This commit is contained in:
Martin Stjernholm 2021-01-14 10:36:25 +00:00 committed by Gerrit Code Review
commit 23e4ab2edf
1 changed files with 5 additions and 1 deletions

View File

@ -1120,7 +1120,11 @@ $(foreach export,$(EXPORTS_LIST),$(eval $(call add-dependency,$$(EXPORTS.$$(expo
# 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
###########################################################