[Minios-devel] [UNIKRAFT PATCH v2] build: add support to specify linking-stage makefile

[Florian Schmidt <florian.schmidt@xxxxxxxxx>]

By setting UK_PLAT_*_LINKER, a platform library can now set the path and
filename of the Linker.uk file. The default is the old behavior of
"Linker.uk" in the platform library base directory. This can be necessary
if a platform library effectively builds binaries for multiple
closely-related platforms: for example, libkvmplat creating a binary
with a multiboot header for QEMU, and one without (and a different entry
point) for Firecracker.

Signed-off-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>
Signed-off-by: Florian Schmidt <florian.schmidt@xxxxxxxxx>
---
 support/build/Makefile.rules | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/support/build/Makefile.rules b/support/build/Makefile.rules
index 04f2f0dc..b8571416 100644
--- a/support/build/Makefile.rules
+++ b/support/build/Makefile.rules
@@ -125,13 +125,14 @@ undefine _IMPORT_BASE
 endef
 # _import_linker $plat_name
 define _import_linker =
- include $(UK_PLAT_$(call uc,$(1))_BASE)/Linker.uk
+ include $(UK_PLAT_$(call uc,$(1))_LINKER)
 endef
 
 # Register a platform to the build system
 define addplat =
 UK_PLATS += $(1)
-$(eval UK_PLAT_$(call uc,$(1))_BASE  := $(_IMPORT_BASE))
+$(eval UK_PLAT_$(call uc,$(1))_BASE   := $(_IMPORT_BASE))
+$(eval UK_PLAT_$(call uc,$(1))_LINKER := $(_IMPORT_BASE)/Linker.uk)
 endef
 
 # addplat_s $platname,$switch
-- 
2.21.0


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel