aboutsummaryrefslogtreecommitdiff
path: root/support/config-fragments
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-08-04 08:50:48 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-08-04 08:55:10 +0200
commitdc938c221d36c2dd7d22cfd19259662d823a2376 (patch)
treeaeb031d0f8a3e4af436ddb15f6cc60e62f8b52cc /support/config-fragments
parent841c695468fa9c20c2008e9eebd2d115e4289fb2 (diff)
downloadbuildroot-dc938c221d36c2dd7d22cfd19259662d823a2376.tar.gz
buildroot-dc938c221d36c2dd7d22cfd19259662d823a2376.tar.bz2
support/config-fragments/autobuild: set gcc version for RISC-V toolchains
Prior to b3ba26150d49dbc6b06ad402c5f6fbd398a71451 ("toolchain/toolchain-external/toolchain-external-custom: be more flexible on gcc version"), the default gcc version selected by Buildroot for custom external toolchain was affected by the BR2_ARCH_NEEDS_GCC_AT_LEAST_xyz definitions. Since BR2_riscv selects BR2_ARCH_NEEDS_GCC_AT_LEAST_7, gcc 7.x was the default gcc version assumed to be used in a custom RISC-V external toolchain, so our config snippets for RISC-V toolchains were correct. With b3ba26150d49dbc6b06ad402c5f6fbd398a71451 applied, the default gcc version assumed for custom external toolchains is the latest one (currently gcc 9.x), while our RISC-V toolchains use gcc 7.x. So we now need to explicitly give the gcc version used by our RISC-V toolchains, otherwise the build fails with: Incorrect selection of gcc version: expected 9.x, got 7.4.0 Fixes: http://autobuild.buildroot.net/results/b872befe1adec2633b9cbcc49bc0eb7619f606c2/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'support/config-fragments')
-rw-r--r--support/config-fragments/autobuild/br-riscv32.config1
-rw-r--r--support/config-fragments/autobuild/br-riscv64.config1
2 files changed, 2 insertions, 0 deletions
diff --git a/support/config-fragments/autobuild/br-riscv32.config b/support/config-fragments/autobuild/br-riscv32.config
index c64dd79b4d..cea472400b 100644
--- a/support/config-fragments/autobuild/br-riscv32.config
+++ b/support/config-fragments/autobuild/br-riscv32.config
@@ -3,6 +3,7 @@ BR2_RISCV_32=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv32-glibc-2019.05.1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_0=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/support/config-fragments/autobuild/br-riscv64.config b/support/config-fragments/autobuild/br-riscv64.config
index 4c156e9e34..2b6ba7094d 100644
--- a/support/config-fragments/autobuild/br-riscv64.config
+++ b/support/config-fragments/autobuild/br-riscv64.config
@@ -2,6 +2,7 @@ BR2_riscv=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv64-glibc-2019.05.1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_1=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y