diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2017-06-01 22:28:14 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-06-01 22:28:14 +0200 |
| commit | 11271540bfe6adafbc133caf6b5b902a816f5f02 (patch) | |
| tree | 48df469d4e88c7e6efc0a8f4f8d5a386468ed72b /toolchain | |
| parent | 24d6c5258ee38c38f0156b057cecd3cfe7ed7b1d (diff) | |
| parent | 8e5eef6c323c6a928ccea7279b3d9848419b99d9 (diff) | |
| download | buildroot-11271540bfe6adafbc133caf6b5b902a816f5f02.tar.gz buildroot-11271540bfe6adafbc133caf6b5b902a816f5f02.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/toolchain-common.in | 5 | ||||
| -rw-r--r-- | toolchain/toolchain-external/toolchain-external-custom/Config.in.options | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index 76c0e7cdcf..d670f44747 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -320,10 +320,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_6 bool select BR2_TOOLCHAIN_GCC_AT_LEAST_5 +config BR2_TOOLCHAIN_GCC_AT_LEAST_7 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_6 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_GCC_AT_LEAST string + default "7" if BR2_TOOLCHAIN_GCC_AT_LEAST_7 default "6" if BR2_TOOLCHAIN_GCC_AT_LEAST_6 default "5" if BR2_TOOLCHAIN_GCC_AT_LEAST_5 default "4.9" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index ba5b97702a..d1b76c32ac 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -23,6 +23,10 @@ choice Set to the gcc version that is used by your external toolchain. +config BR2_TOOLCHAIN_EXTERNAL_GCC_7 + bool "7.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_7 + config BR2_TOOLCHAIN_EXTERNAL_GCC_6 bool "6.x" select BR2_TOOLCHAIN_GCC_AT_LEAST_6 |
