diff --git a/lib/romlib/Makefile b/lib/romlib/Makefile index 3d2b85026..4cac75b29 100644 --- a/lib/romlib/Makefile +++ b/lib/romlib/Makefile @@ -73,7 +73,7 @@ $(BUILD_DIR)/jmptbl.i: ../../$(PLAT_DIR)/jmptbl.i | $$(@D)/ $(s)echo " PRE $@" $(q)$(ROMLIB_GEN) pre --output $@ --deps $(BUILD_DIR)/jmptbl.d $< -$(WRAPPER_SOURCES) &: $(BUILD_DIR)/jmptbl.i | $$(@D)/ +$(WRAPPER_SOURCES) $&: $(BUILD_DIR)/jmptbl.i | $$(@D)/ $(s)echo " WRP $<" $(q)$(ROMLIB_GEN) genwrappers --bti=$(ENABLE_BTI) -b $(WRAPPER_DIR) $< diff --git a/make_helpers/utilities.mk b/make_helpers/utilities.mk index efa0ab90a..fcccd2406 100644 --- a/make_helpers/utilities.mk +++ b/make_helpers/utilities.mk @@ -21,6 +21,13 @@ directory-name = $(call decompat-path,$(dir $(call compat-path,$(1)))) escape-shell = '$(subst ','\'',$(1))' +# +# The grouped-target symbol. Grouped targets are not supported on versions of +# GNU Make <= 4.2, which was most recently packaged with Ubuntu 20.04. +# + +& := $(if $(filter grouped-target,$(.FEATURES)),&) + # # Upper-case a string value. #