From 397aa8b0fa86d452d35700290e9f2bfbc3b8da6b Mon Sep 17 00:00:00 2001 From: Andrei Tatar Date: Tue, 29 Aug 2023 01:18:26 +0200 Subject: [PATCH] Select lib-compiler-rt as Kconfig dependency Commit 70bac65 (Split off functionality that depends on libunwind) in lib-compiler-rt removed the circular dependency between it and libunwind. This change thus removes the workaround check for lib-compiler-rt and more cleanly expresses it through Kconfig `select`. Signed-off-by: Andrei Tatar Reviewed-by: Stefan Jumarea Approved-by: Razvan Deaconescu Tested-by: Unikraft CI GitHub-Closes: #10 --- Config.uk | 1 + Makefile.uk | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Config.uk b/Config.uk index 90a18f8..3b3610a 100644 --- a/Config.uk +++ b/Config.uk @@ -2,4 +2,5 @@ menuconfig LIBUNWIND bool "libunwind - unwinder" select LIBNOLIBC if !HAVE_LIBC select LIBCXXABI + select LIBCOMPILER_RT default n diff --git a/Makefile.uk b/Makefile.uk index cdc7223..2594192 100644 --- a/Makefile.uk +++ b/Makefile.uk @@ -39,12 +39,6 @@ ################################################################################ $(eval $(call addlib_s,libunwind,$(CONFIG_LIBUNWIND))) -ifeq ($(CONFIG_LIBUNWIND),y) -ifneq ($(CONFIG_LIBCOMPILER_RT),y) -$(error Require libcompiler_rt) -endif -endif - ################################################################################ # Sources ################################################################################ -- 2.39.5