Merge tag 'for-linus-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[sfrench/cifs-2.6.git] / arch / um / Kconfig

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index d49f471b02e3618322fcbc1cdda793aa082e2276..16187211d059da05055ccc962f0fff035eb01a15 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -62,12 +62,12 @@ config NR_CPUS
 
 source "arch/$(HEADER_ARCH)/um/Kconfig"
 
-config FORBID_STATIC_LINK
-       bool
+config MAY_HAVE_RUNTIME_DEPS
+        bool
 
 config STATIC_LINK
        bool "Force a static link"
-       depends on !FORBID_STATIC_LINK
+       depends on CC_CAN_LINK_STATIC_NO_RUNTIME_DEPS || !MAY_HAVE_RUNTIME_DEPS
        help
          This option gives you the ability to force a static link of UML.
          Normally, UML is linked as a shared binary.  This is inconvenient for