From 8f0b2b7d78404fc18d2b641686bc6d9af1d694f1 Mon Sep 17 00:00:00 2001 From: Daniel Dickinson Date: Sun, 3 Jan 2016 01:02:55 -0500 Subject: [PATCH] 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 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 Link: https://github.com/openwrt/openwrt/pull/22089 Signed-off-by: Robert Marko --- target/imagebuilder/Config.in | 2 +- target/sdk/Config.in | 2 +- toolchain/Config.in | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/target/imagebuilder/Config.in b/target/imagebuilder/Config.in index c1a5212f6d..df6de04536 100644 --- 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 9fee5abdc3..1ea18d0aa8 100644 --- 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 71ebbeb47b..056932bf86 100644 --- 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