[Minios-devel] [UNIKRAFT PATCH 1/3] Makefile: Include internal libs Makefile.uk before external libs Makefile.uk

[Costin Lupu <costin.lupu@xxxxxxxxx>]

The reason is that the internal libs headers should have priority because they
provide the definitions on which the external libs should depend.

Let's take the uktime internal lib for example. It provides the time related
definitions which should be used by all external libs and apps. When including
<time.h> or <sys/time.h>, this is the lib where these headers should come from.
If customizations or extensions are allowed in the external libraries then the
internal headers should enable this by using #include_next directives (see next
patch).

Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 99369cdc..0889760e 100644
--- a/Makefile
+++ b/Makefile
@@ -541,6 +541,8 @@ ifneq ($(CONFIG_UK_BASE),$(CONFIG_UK_APP))
 $(eval $(call _import_lib,$(CONFIG_UK_APP)));
 endif
 
+include $(CONFIG_UK_BASE)/lib/Makefile.uk # libraries
+
 # external libraries
 $(foreach E,$(ELIB_DIR), \
        $(eval $(call _import_lib,$(E))); \
@@ -553,7 +555,6 @@ include $(CONFIG_UK_BASE)/plat/Makefile.uk # platform 
libraries
 $(foreach E,$(EPLAT_DIR), \
        $(eval $(call _import_lib,$(E))); \
 )
-include $(CONFIG_UK_BASE)/lib/Makefile.uk # libraries
 include $(CONFIG_UK_BASE)/Makefile.uk # Unikraft base
 
 ifeq ($(call qstrip,$(UK_PLATS) $(UK_PLATS-y)),)
-- 
2.20.1


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