opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build(makefile): export cgo config for windows-safe go commands

Browse source 
- stop overriding GO/WEB_GO to plain go in Windows blocks

- export CGO_ENABLED=0 via environment instead of inline shell assignment
This commit is contained in:
SiYue 2026-04-24 16:34:14 +08:00
commit b86fd9ad54
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -9,8 +9,6 @@ EXT=
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
POWERSHELL=powershell -NoProfile -Command POWERSHELL=powershell -NoProfile -Command
GO=go
WEB_GO=go
WINDOWS_GOARCH_RAW:=$(strip $(shell go env GOARCH 2>NUL)) WINDOWS_GOARCH_RAW:=$(strip $(shell go env GOARCH 2>NUL))
endif endif
@ -34,13 +32,15 @@ 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 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
# Go variables # Go variables
GO?=CGO_ENABLED=0 go GO?=go
WEB_GO?=$(GO) WEB_GO?=$(GO)
CGO_ENABLED?=0
GO_BUILD_TAGS?=goolm,stdjson GO_BUILD_TAGS?=goolm,stdjson
GOFLAGS?=-v -tags $(GO_BUILD_TAGS) GOFLAGS?=-v -tags $(GO_BUILD_TAGS)
GOCACHE?=$(CURDIR)/.cache/go-build GOCACHE?=$(CURDIR)/.cache/go-build
GOMODCACHE?=$(CURDIR)/.cache/go-mod GOMODCACHE?=$(CURDIR)/.cache/go-mod
GOTOOLCHAIN?=local GOTOOLCHAIN?=local
export CGO_ENABLED
export GOCACHE export GOCACHE
export GOMODCACHE export GOMODCACHE
export GOTOOLCHAIN export GOTOOLCHAIN

6
web/Makefile
View file

@ -2,13 +2,15 @@
build-android-arm64 build-android-bundle build-android-arm64 build-android-bundle
# Go variables # Go variables
GO?=CGO_ENABLED=0 go GO?=go
WEB_GO?=$(GO) WEB_GO?=$(GO)
CGO_ENABLED?=0
GO_BUILD_TAGS?=goolm,stdjson GO_BUILD_TAGS?=goolm,stdjson
GOFLAGS?=-v -tags $(GO_BUILD_TAGS) GOFLAGS?=-v -tags $(GO_BUILD_TAGS)
GOCACHE?=$(abspath ../.cache/go-build) GOCACHE?=$(abspath ../.cache/go-build)
GOMODCACHE?=$(abspath ../.cache/go-mod) GOMODCACHE?=$(abspath ../.cache/go-mod)
GOTOOLCHAIN?=local GOTOOLCHAIN?=local
export CGO_ENABLED
export GOCACHE export GOCACHE
export GOMODCACHE export GOMODCACHE
export GOTOOLCHAIN export GOTOOLCHAIN
@ -28,8 +30,6 @@ LAUNCHER_GUI_LDFLAG=
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
POWERSHELL=powershell -NoProfile -Command POWERSHELL=powershell -NoProfile -Command
GO=go
WEB_GO=go
WINDOWS_GOARCH_RAW:=$(strip $(shell go env GOARCH 2>NUL)) WINDOWS_GOARCH_RAW:=$(strip $(shell go env GOARCH 2>NUL))
endif endif