From ea4ab0c81bcbc3a9812edf4903c2d461a68b3ddc Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Fri, 1 Sep 2023 17:45:18 +0300 Subject: [PATCH] buildroot: Add the missing "BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y" If "BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y" does not exist in the config, this will cause toolchain prefix to be overwritten. Then the build will use Bootlin toolchain, which is downloaded as part of the build. Before: $ grep ^BR2_TOOLCHAIN_EXTERNAL build/buildroot.build/.config BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux" BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y After: $ grep ^BR2_TOOLCHAIN_EXTERNAL build/buildroot.build/.config BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED=y BR2_TOOLCHAIN_EXTERNAL_PATH="$(RISCV)" BR2_TOOLCHAIN_EXTERNAL_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-unknown-linux-gnu" BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-unknown-linux-gnu" BR2_TOOLCHAIN_EXTERNAL_GCC_10=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_0=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y BR2_TOOLCHAIN_EXTERNAL_HAS_SSP_STRONG=y BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y Signed-off-by: Jarkko Sakkinen --- conf/qemu_riscv64_virt_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/qemu_riscv64_virt_defconfig b/conf/qemu_riscv64_virt_defconfig index 23c6cba15..e614c61b7 100644 --- a/conf/qemu_riscv64_virt_defconfig +++ b/conf/qemu_riscv64_virt_defconfig @@ -6,6 +6,7 @@ BR2_RISCV_ABI_LP64D=y BR2_GCC_TARGET_ABI="lp64d" # BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_PATH="$(RISCV)" BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-unknown-linux-gnu" BR2_TOOLCHAIN_EXTERNAL_GCC_10=y