]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
um: remove dependency on undefined CC_CAN_LINK_STATIC_NO_RUNTIME_DEPS
authorMasahiro Yamada <masahiroy@kernel.org>
Tue, 24 Sep 2024 11:33:40 +0000 (20:33 +0900)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 10 Oct 2024 10:08:25 +0000 (12:08 +0200)
CC_CAN_LINK_STATIC_NO_RUNTIME_DEPS is not defined anywhere.

In the submitted patch set [1], the first patch "um/kconfig: introduce
CC_CAN_LINK_STATIC_NO_RUNTIME_DEPS" was not applied.

Only 2/3 and 3/3 were applied, which are now:

 - 730586ff7fad ("um: Allow static linking for non-glibc implementations")
 - 5e1121cd43d4 ("um: Some fixes to build UML with musl")

Given that nobody has noticed the missing first patch for many years,
it seems it was unnecessary.

[1]: https://lore.kernel.org/lkml/20200719210222.2811-1-ignat@cloudflare.com/

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://patch.msgid.link/20240924113342.32530-1-masahiroy@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
arch/um/Kconfig

index c89575d05021f19ee7b50b2445215fb35aa4f84c..de735d59b6c8a5e2f1461d07f53435e37adde7af 100644 (file)
@@ -94,7 +94,7 @@ config MAY_HAVE_RUNTIME_DEPS
 
 config STATIC_LINK
        bool "Force a static link"
-       depends on CC_CAN_LINK_STATIC_NO_RUNTIME_DEPS || !MAY_HAVE_RUNTIME_DEPS
+       depends on !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