Merge pull request #52 from shengwen-tw/buildroot

Bump Buildroot version and select GCC 14 with binutils 2.42
sysprog21 · Aug 27, 2024 · 1023b4c · 1023b4c
2 parents 207a4d7 + 2cc84e1
commit 1023b4c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/configs/buildroot.config b/configs/buildroot.config
@@ -22,13 +22,13 @@ BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc"
 # BR2_TOOLCHAIN_BUILDROOT_CXX is not set
 BR2_KERNEL_HEADERS_6_1=y
-BR2_BINUTILS_VERSION_2_41_X=y
+BR2_BINUTILS_VERSION_2_42_X=y
 # BR2_BINUTILS_GPROFNG is not set
-BR2_GCC_VERSION_12_X=y
+BR2_GCC_VERSION_14_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-softfloat"
 BR2_TOOLCHAIN_HEADERS_AT_LEAST="6.1"
-BR2_TOOLCHAIN_GCC_AT_LEAST_12=y
-BR2_TOOLCHAIN_GCC_AT_LEAST="12"
+BR2_TOOLCHAIN_GCC_AT_LEAST_14=y
+BR2_TOOLCHAIN_GCC_AT_LEAST="14"
 BR2_SSP_NONE=y
 # BR2_SSP_REGULAR is not set
 # BR2_SSP_STRONG is not set

diff --git a/scripts/build-image.sh b/scripts/build-image.sh
@@ -21,7 +21,7 @@ PARALLEL="-j$(nproc)"
 
 function do_buildroot
 {
-    ASSERT git clone https://github.com/buildroot/buildroot -b 2024.02.x --depth=1
+    ASSERT git clone https://github.com/buildroot/buildroot -b 2024.05.2 --depth=1
     cp -f configs/buildroot.config buildroot/.config
     cp -f configs/busybox.config buildroot/busybox.config
     # Otherwise, the error below raises: