gcc: make colors optional based on the GCC_COLORS env var

[openwrt.git] / toolchain / gcc / Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 81b795e..a8c39d6 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,9 +2,8 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_USE_VERSION_5 if TARGET_octeon
        default GCC_USE_VERSION_4_8_ARC if arc
-       default GCC_USE_VERSION_4_8_LINARO
+       default GCC_USE_VERSION_5
        help
          Select the version of gcc you wish to use.
 
@@ -32,7 +31,7 @@ config GCC_USE_GRAPHITE
 config GCC_USE_SYSTEM_PPL_CLOOG
        bool
        prompt "Use the system versions of PPL and CLooG"
-       depends on GCC_USE_GRAPHITE
+       depends on GCC_USE_GRAPHITE && GCC_VERSION_4_8
        default n
 
 config EXTRA_GCC_CONFIG_OPTIONS