mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-04 06:10:16 +03:00
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained 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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user