[OpenWrt-Devel] [PATCH 07/14] toolchain sdk ib: Allow use of external chain as with openwrt toolchain

[openwrt at daniel.thecshore.com]

From: Daniel Dickinson <openwrt at daniel.thecshore.com>

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 at daniel.thecshore.com>
---
 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 1bc4533..9f50b46 100644
--- a/target/imagebuilder/Config.in
+++ b/target/imagebuilder/Config.in
@@ -1,7 +1,7 @@
 config IB
 	bool "Build the OpenWrt Image Builder"
 	depends on !PROFILE_KCONFIG
-	depends on !EXTERNAL_TOOLCHAIN
+	depends on !EXTERNAL_TOOLCHAIN || EXTERNAL_TOOLCHAIN_IB
 	help
 	  This is essentially a stripped-down version of the buildroot
 	  with precompiled packages, kernel image and image building tools.
diff --git a/target/sdk/Config.in b/target/sdk/Config.in
index 28c6f3e..1a82149 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
 	help
 	  This is essentially a stripped-down version of the buildroot
 	  with a precompiled toolchain. It can be used to develop and
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 1f6f753..d7ac97d 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -134,6 +134,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
-- 
2.4.3
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel