From 59da5be8374d645a87b5daf1380dea500ea19b6d Mon Sep 17 00:00:00 2001 From: Simon Kuenzer Date: Sat, 9 Sep 2023 01:32:07 +0200 Subject: [PATCH] build: Rename `_import_linker` to `import_linker` This commit renames the Makefile function `_import_linker` to `import_linker`. The original intent was for this function to be purely internal and only used in the core `Makefile`. It turns out that it might be used in other places in the future, like potentilly external architectures, so this commit removes the inappropriate `_` prefix. Signed-off-by: Simon Kuenzer Reviewed-by: Cezar Craciunoiu Reviewed-by: Michalis Pappas Reviewed-by: Maria Sfiraiala Approved-by: Razvan Deaconescu GitHub-Closes: #1104 --- Makefile | 2 +- support/build/Makefile.rules | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1f5245a08..3fc9dad91 100644 --- a/Makefile +++ b/Makefile @@ -768,7 +768,7 @@ $(foreach _D,$(UK_DEPS) $(UK_DEPS-y),\ endif # include Makefile for platform linking (`Linker.uk`) -$(foreach plat,$(UK_PLATS),$(eval $(call _import_linker,$(plat)))) +$(foreach plat,$(UK_PLATS),$(eval $(call import_linker,$(plat)))) .PHONY: prepare preprocess image libs objs clean diff --git a/support/build/Makefile.rules b/support/build/Makefile.rules index a3b18e646..1ef479940 100644 --- a/support/build/Makefile.rules +++ b/support/build/Makefile.rules @@ -246,8 +246,8 @@ IMPORT_BASE := $(1) $(call verbose_include,$(1)/Makefile.uk) undefine IMPORT_BASE endef -# _import_linker $plat_name -define _import_linker = +# import_linker $plat_name +define import_linker = $(call verbose_include,$(UK_PLAT_$(call uc,$(1))_LINKER)) endef -- 2.39.5