From 23a6786f05811109ff194d3009e2141d27e7e4cc Mon Sep 17 00:00:00 2001 From: Felicitas Pojtinger Date: Fri, 16 May 2025 15:58:21 -0700 Subject: [PATCH] package/go-bootstrap-stage1: fix builds on GCC 15 GCC 15 defaults to -std=gnu23, which adds the bool keyword, causing conflicts with stage1: https://gcc.gnu.org/gcc-15/porting_to.html#c23-new-keywords As a workaround, force the build to use -std=gnu99 mode. Signed-off-by: Felicitas Pojtinger [Peter: extend commit message] Signed-off-by: Peter Korsgaard (cherry picked from commit a2356a9e0a1a6d24c11bb74dd8ca3136c5c1c6cb) Signed-off-by: Thomas Perale --- package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk b/package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk index 3e4ee57432..83cb278f68 100644 --- a/package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk +++ b/package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk @@ -17,12 +17,13 @@ HOST_GO_BOOTSTRAP_STAGE1_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE1_VERSION # The go build system is not compatible with ccache, so use # HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +# CFLAGS and GO_CCFLAGS have no effect, so overwrite CC directly. HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV = \ GOOS=linux \ GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_STAGE1_ROOT)" \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ - CC=$(HOSTCC_NOCCACHE) \ + CC="$(HOSTCC_NOCCACHE) -std=gnu99" \ CGO_ENABLED=0 define HOST_GO_BOOTSTRAP_STAGE1_BUILD_CMDS