Skip to content

Commit 1023b4c

Browse files
authored
Merge pull request #52 from shengwen-tw/buildroot
Bump Buildroot version and select GCC 14 with binutils 2.42
2 parents 207a4d7 + 2cc84e1 commit 1023b4c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

configs/buildroot.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
2222
BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc"
2323
# BR2_TOOLCHAIN_BUILDROOT_CXX is not set
2424
BR2_KERNEL_HEADERS_6_1=y
25-
BR2_BINUTILS_VERSION_2_41_X=y
25+
BR2_BINUTILS_VERSION_2_42_X=y
2626
# BR2_BINUTILS_GPROFNG is not set
27-
BR2_GCC_VERSION_12_X=y
27+
BR2_GCC_VERSION_14_X=y
2828
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-softfloat"
2929
BR2_TOOLCHAIN_HEADERS_AT_LEAST="6.1"
30-
BR2_TOOLCHAIN_GCC_AT_LEAST_12=y
31-
BR2_TOOLCHAIN_GCC_AT_LEAST="12"
30+
BR2_TOOLCHAIN_GCC_AT_LEAST_14=y
31+
BR2_TOOLCHAIN_GCC_AT_LEAST="14"
3232
BR2_SSP_NONE=y
3333
# BR2_SSP_REGULAR is not set
3434
# BR2_SSP_STRONG is not set

scripts/build-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ PARALLEL="-j$(nproc)"
2121

2222
function do_buildroot
2323
{
24-
ASSERT git clone https://github.com/buildroot/buildroot -b 2024.02.x --depth=1
24+
ASSERT git clone https://github.com/buildroot/buildroot -b 2024.05.2 --depth=1
2525
cp -f configs/buildroot.config buildroot/.config
2626
cp -f configs/busybox.config buildroot/busybox.config
2727
# Otherwise, the error below raises:

0 commit comments

Comments
 (0)