From 36ca85ad09dcb4da3ba1331ab8feb51b96cccd18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B=E6=99=BA=E8=B6=850668000959?= Date: Thu, 4 Jun 2026 17:44:07 +0800 Subject: [PATCH] fix: handle space in go env GOVERSION with firstword go env GOVERSION may return values like go1.25.10 X:nodwarf5 with an embedded space on some toolchain configurations, breaking -ldflags. Use firstword to extract only the first token. Fixes #2976. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 81ef32f6f..3e36c5c1b 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ endif VERSION?=$(if $(VERSION_RAW),$(VERSION_RAW),dev) GIT_COMMIT=$(if $(GIT_COMMIT_RAW),$(GIT_COMMIT_RAW),dev) BUILD_TIME=$(if $(BUILD_TIME_RAW),$(BUILD_TIME_RAW),dev) -GO_VERSION=$(if $(GO_VERSION_RAW),$(GO_VERSION_RAW),unknown) +GO_VERSION=$(if $(GO_VERSION_RAW),$(firstword $(GO_VERSION_RAW)),unknown) CONFIG_PKG=github.com/sipeed/picoclaw/pkg/config LDFLAGS=-X $(CONFIG_PKG).Version=$(VERSION) -X $(CONFIG_PKG).GitCommit=$(GIT_COMMIT) -X $(CONFIG_PKG).BuildTime=$(BUILD_TIME) -X $(CONFIG_PKG).GoVersion=$(GO_VERSION) -s -w