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 90a18f8bc67a3529eed38a04bdf7e29cf3c55199..3b3610a3dae01182e09480c8775042219ca36b8e 100644 (file)
--- 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 cdc722319d98cee1b413f32b728f1aa9213fe9a6..2594192c78e79d4bc251ce92e8357353802adfa5 100644 (file)
--- 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
 ################################################################################