[Minios-devel] [UNIKRAFT/MUSL PATCH 09/19] Add glue code rules for mem.c in Makefile.uk

[Gaulthier Gain <gaulthier.gain@xxxxxxxxx>]

wip: This commit updates Makefile.uk to support glue code related to
mem.c between musl and Unikraft.

Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
---
 Makefile.uk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile.uk b/Makefile.uk
index b54d414..d0d1eef 100644
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -36,6 +36,10 @@
 # Library registration
 
################################################################################
 $(eval $(call addlib_s,libmusl,$(CONFIG_LIBMUSL)))
+# Additionally, build glue code. This is put into a separate library so that we
+# can apply a thick helping of warning suppressions to musl, which throws
+# lots of compilation warnings, but keep our glue code up to our standards.
+$(eval $(call addlib_s,libmuslglue,$(CONFIG_LIBMUSL)))
 
 
################################################################################
 # Sources
@@ -122,11 +126,14 @@ SUPPRESS_FLAGS += -Wno-unused-parameter 
-Wno-unused-variable -Wno-nonnull \
 LIBMUSL_CFLAGS-y   += $(SUPPRESS_FLAGS)
 LIBMUSL_CXXFLAGS-y += $(SUPPRESS_FLAGS)
 
+LIBMUSLGLUE_SUPPRESS_FLAGS-y += -Wno-unused-parameter
+LIBMUSLGLUE_CFLAGS-y   += $(LIBMUSLGLUE_SUPPRESS_FLAGS-y)
+LIBMUSLGLUE_CXXFLAGS-y += $(LIBMUSLGLUE_SUPPRESS_FLAGS-y)
+
 
################################################################################
 # OS dependencies code - Glue between Unicore and musl
 
################################################################################
-LIBMUSL_SRCS-y += $(LIBMUSL_BASE)/mem.c
-#LIBMUSL_SRCS-y += $(LIBMUSL_BASE)/syscall.c
+LIBMUSLGLUE_SRCS-y += $(LIBMUSL_BASE)/mem.c
 
 
################################################################################
 # musl code -- one external Makefile per sub-lib
-- 
2.11.0


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