toolchain: remove references to $(LIBC)/utils subtarget

[openwrt/staging/nbd.git] / toolchain / Config.in

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 1d230ca22f47c72b82c51c66a8dc9b61b4af5e6e..b0273acafdd7dcfb4862d43da00d45601ed5f8e4 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -37,13 +37,40 @@ menuconfig TARGET_OPTIONS
 
                  Most people will answer N.
 
-config BUILD_LLVM_BPF
-       bool "Build LLVM toolchain for eBPF" if DEVEL
-       help
-         If enabled, a LLVM toolchain for building eBPF binaries will be built.
-         If this is not enabled, eBPF packages can only be built if the host
-         has a suitable toolchain
 
+       choice BPF_TOOLCHAIN
+               prompt "BPF toolchain" if DEVEL
+               default BPF_TOOLCHAIN_BUILD_LLVM if BUILDBOT
+               default BPF_TOOLCHAIN_PREBUILT if HAS_PREBUILT_LLVM_TOOLCHAIN
+               default BPF_TOOLCHAIN_NONE
+
+               config BPF_TOOLCHAIN_NONE
+                       bool "None"
+
+               config BPF_TOOLCHAIN_PREBUILT
+                       bool "Use prebuilt LLVM toolchain"
+                       depends on HAS_PREBUILT_LLVM_TOOLCHAIN
+                       select USE_LLVM_PREBUILT
+
+               config BPF_TOOLCHAIN_HOST
+                       select USE_LLVM_HOST
+                       bool "Use host LLVM toolchain"
+
+               config BPF_TOOLCHAIN_BUILD_LLVM
+                       select USE_LLVM_BUILD
+                       bool "Build LLVM toolchain for eBPF"
+                       help
+                         If enabled, a LLVM toolchain for building eBPF binaries will be built.
+                         If this is not enabled, eBPF packages can only be built if the host
+                         has a suitable toolchain
+       endchoice
+
+       config BPF_TOOLCHAIN_HOST_PATH
+               string
+               depends on BPF_TOOLCHAIN_HOST
+               prompt "Host LLVM toolchain path (prefix)" if DEVEL
+               default "/usr/local/opt/llvm" if HOST_OS_MACOS
+               default ""
 
 menuconfig EXTERNAL_TOOLCHAIN
        bool
@@ -142,6 +169,7 @@ menuconfig EXTERNAL_TOOLCHAIN
                string
                prompt "Toolchain include path"  if DEVEL
                depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+               default "./usr/include ./include/fortify ./include" if EXTERNAL_TOOLCHAIN_LIBC_USE_MUSL
                default "./usr/include ./include"
                help
                  Specify additional directories searched for header files (override
@@ -169,7 +197,6 @@ menuconfig EXTRA_TARGET_ARCH
        bool
        prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS
        depends on !sparc
-       default n
        help
          Some builds may require a 'biarch' toolchain. This option
          allows you to specify an additional target arch.
@@ -220,6 +247,13 @@ comment "Binary tools"
 
 source "toolchain/binutils/Config.in"
 
+config DWARVES
+       bool
+       prompt "Build pahole" if TOOLCHAINOPTS
+       depends on !HOST_OS_MACOS
+       help
+         Enable if you want to build pahole and the dwarves tools.
+
 comment "Compiler"
        depends on TOOLCHAINOPTS
 
@@ -274,6 +308,26 @@ config GDB_PYTHON
        help
          Enable the python bindings for GDB to allow using python in the gdb shell.
 
+config HAS_BPF_TOOLCHAIN
+       bool
+
+config HAS_PREBUILT_LLVM_TOOLCHAIN
+       def_bool $(shell, [ -f llvm-bpf/.llvm-version ] && echo y || echo n)
+
+config USE_LLVM_HOST
+       select HAS_BPF_TOOLCHAIN
+       bool
+
+config USE_LLVM_PREBUILT
+       select HAS_BPF_TOOLCHAIN
+       default y if !DEVEL && !BUILDBOT && HAS_PREBUILT_LLVM_TOOLCHAIN
+       bool
+
+config USE_LLVM_BUILD
+       default y if !DEVEL && BUILDBOT
+       select HAS_BPF_TOOLCHAIN
+       bool
+
 config USE_GLIBC
        default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (arc)
        bool