toolchain: sdk: ib: allow external toolchain override

Allow building imagebuilder and/or sdk with dependency on the same
external toolchain as used to build the imagebuilder or sdk (so that ib
and sdk may be built using an external toolchain).

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
Original patch:
https://lists.openwrt.org/pipermail/openwrt-devel/2016-January/012552.html
[rebased to current main, impvove commit title]
Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22089
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/imagebuilder/Config.in b/target/imagebuilder/Config.in
index c1a5212f6d9bfd9e7af9fdf9b988ef0bbada7d6e..df6de04536d620874c0c727a86fdae999d429aee 100644 (file)
--- a/target/imagebuilder/Config.in
+++ b/target/imagebuilder/Config.in
@@ -1,6 +1,6 @@
 config IB
        bool "Build the OpenWrt Image Builder"
-       depends on !EXTERNAL_TOOLCHAIN
+       depends on !EXTERNAL_TOOLCHAIN || EXTERNAL_TOOLCHAIN_IB
        default BUILDBOT
        help
          This is essentially a stripped-down version of the buildroot

diff --git a/target/sdk/Config.in b/target/sdk/Config.in
index 9fee5abdc36c519fd631090aa04bb4e293b44eb4..1ea18d0aa81ef0d851b09f9165bfb85007ec8f36 100644 (file)
--- a/target/sdk/Config.in
+++ b/target/sdk/Config.in
@@ -1,6 +1,6 @@
 config SDK
        bool "Build the OpenWrt SDK"
-       depends on !EXTERNAL_TOOLCHAIN
+       depends on !EXTERNAL_TOOLCHAIN || EXTERNAL_TOOLCHAIN_SDK
        default BUILDBOT
        help
          This is essentially a stripped-down version of the buildroot

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 71ebbeb47bf2a024ba070ac02bf0c07a10227c14..056932bf866ea4f00891afdb9c2a070e9e731546 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -194,6 +194,22 @@ menuconfig EXTERNAL_TOOLCHAIN
                  Specify additional directories searched for libraries (override LDFLAGS).
                  Use ./DIR for directories relative to the root above.
 
+       config EXTERNAL_TOOLCHAIN_IB
+               bool
+               prompt "Allow Imagebuilder with external toolchain" if DEVEL
+               depends on EXTERNAL_TOOLCHAIN
+               default n
+               help
+                 Allows selecting to build ImageBuilder even with external toolchain.
+
+       config EXTERNAL_TOOLCHAIN_SDK
+               bool
+               prompt "Allow SDK with external toolchain" if DEVEL
+               depends on EXTERNAL_TOOLCHAIN
+               default n
+               help
+                 Allows selecting to build SDK even with external toolchain.
+
 config NEED_TOOLCHAIN
        bool
        depends on DEVEL