[LEDE-DEV] [RFC 8/8] toolchain: choose new toolchain only if

Syrone Wong wong.syrone at gmail.com
Wed Jul 13 06:57:08 PDT 2016


developer mode has been enabled,
GCC 5.3 binutils 2.25.1 otherwise.

Signed-off-by: Syrone Wong <wong.syrone at gmail.com>
---
 toolchain/binutils/Config.in      | 2 +-
 toolchain/binutils/Config.version | 2 +-
 toolchain/gcc/Config.in           | 2 +-
 toolchain/gcc/Config.version      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 16c8005..ffb2b98 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,8 +2,8 @@
 
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
+	default BINUTILS_USE_VERSION_2_26_1 if (!arc && DEVEL)
 	default BINUTILS_USE_VERSION_2_25_1 if !arc
-	default BINUTILS_USE_VERSION_2_26_1 if !arc
 	default BINUTILS_USE_VERSION_2_26_ARC if arc
 	help
 	  Select the version of binutils you wish to use.
diff --git a/toolchain/binutils/Config.version b/toolchain/binutils/Config.version
index 2951c0b..8a6c38a 100644
--- a/toolchain/binutils/Config.version
+++ b/toolchain/binutils/Config.version
@@ -6,7 +6,7 @@ config BINUTILS_VERSION_2_25_1
 	bool
 
 config BINUTILS_VERSION_2_26_1
-	default y if (!TOOLCHAINOPTS && !arc)
+	default y if (!TOOLCHAINOPTS && !arc && DEVEL)
 	bool
 
 config BINUTILS_VERSION_2_26_ARC
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 13cbe7a8..04e06fd 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,8 +3,8 @@
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
 	default GCC_USE_VERSION_4_8_ARC if arc
+	default GCC_USE_VERSION_6 if DEVEL
 	default GCC_USE_VERSION_5
-	default GCC_USE_VERSION_6
 	help
 	  Select the version of gcc you wish to use.
 
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 6a95862..9006925 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -18,5 +18,5 @@ config GCC_VERSION_5
 	bool
 
 config GCC_VERSION_6
-	default y if (!TOOLCHAINOPTS && !arc)
+	default y if (!TOOLCHAINOPTS && !arc && DEVEL)
 	bool
-- 
2.9.0




More information about the Lede-dev mailing list