Commit 730586ff authored by Ignat Korchagin's avatar Ignat Korchagin Committed by Richard Weinberger
Browse files

um: Allow static linking for non-glibc implementations 



It is possible to produce a statically linked UML binary with UML_NET_VECTOR,
UML_NET_VDE and UML_NET_PCAP options enabled using alternative libc
implementations, which do not rely on NSS, such as musl.

Allow static linking in this case.

Signed-off-by: default avatarIgnat Korchagin <ignat@cloudflare.com>
Reviewed-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Tested-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 5e1121cd

arch/um/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ config NR_CPUS 


source "arch/$(HEADER_ARCH)/um/Kconfig"



config FORBID_STATIC_LINK

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

arch/um/drivers/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ config UML_NET_DAEMON 
config UML_NET_VECTOR

	bool "Vector I/O high performance network devices"

	depends on UML_NET

	select FORBID_STATIC_LINK

	select MAY_HAVE_RUNTIME_DEPS

	help

	This User-Mode Linux network driver uses multi-message send

	and receive functions. The host running the UML guest must have
@@ -246,7 +246,7 @@ config UML_NET_VECTOR 
config UML_NET_VDE

	bool "VDE transport (obsolete)"

	depends on UML_NET

	select FORBID_STATIC_LINK

	select MAY_HAVE_RUNTIME_DEPS

	help

	This User-Mode Linux network transport allows one or more running

	UMLs on a single host to communicate with each other and also
@@ -294,7 +294,7 @@ config UML_NET_MCAST 
config UML_NET_PCAP

	bool "pcap transport (obsolete)"

	depends on UML_NET

	select FORBID_STATIC_LINK

	select MAY_HAVE_RUNTIME_DEPS

	help

	The pcap transport makes a pcap packet stream on the host look

	like an ethernet device inside UML.  This is useful for making

CRA Git | Maintained and supported by SUSTech CRA and CCSE