From: Andrei Tatar <andrei@unikraft.io>
Date: Mon, 28 Aug 2023 23:18:26 +0000 (+0200)
Subject: Select lib-compiler-rt as Kconfig dependency
X-Git-Tag: RELEASE-0.15.0~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=397aa8b0fa86d452d35700290e9f2bfbc3b8da6b;p=unikraft%2Flibs%2Flibunwind.git

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 <andrei@unikraft.io>
Reviewed-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #10
---

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
 ################################################################################