From 5c7b55098324f3624f9513300cb0fe776a57ce12 Mon Sep 17 00:00:00 2001 From: Vladislav Yarmak Date: Wed, 6 Sep 2023 13:13:57 +0300 Subject: [PATCH] use older golang for windows build for a while --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fd71735..f747153 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ NDK_CC_ARM = $(abspath ../../ndk-toolchain-arm/bin/arm-linux-androideabi-gcc) NDK_CC_ARM64 = $(abspath ../../ndk-toolchain-arm64/bin/aarch64-linux-android21-clang) GO := go +GO120 := /usr/lib64/go/1.20/bin/go src = $(wildcard *.go */*.go */*/*.go) go.mod go.sum @@ -103,13 +104,13 @@ $(OUTSUFFIX).darwin-arm64: $(src) CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 $(GO) build $(BUILDOPTS) $(LDFLAGS) -o $@ $(OUTSUFFIX).windows-amd64.exe: $(src) - CGO_ENABLED=0 GOOS=windows GOARCH=amd64 $(GO) build $(BUILDOPTS) $(LDFLAGS) -o $@ + CGO_ENABLED=0 GOOS=windows GOARCH=amd64 $(GO120) build $(BUILDOPTS) $(LDFLAGS) -o $@ $(OUTSUFFIX).windows-386.exe: $(src) - CGO_ENABLED=0 GOOS=windows GOARCH=386 $(GO) build $(BUILDOPTS) $(LDFLAGS) -o $@ + CGO_ENABLED=0 GOOS=windows GOARCH=386 $(GO120) build $(BUILDOPTS) $(LDFLAGS) -o $@ $(OUTSUFFIX).windows-arm.exe: $(src) - CGO_ENABLED=0 GOOS=windows GOARCH=arm GOARM=7 $(GO) build $(BUILDOPTS) $(LDFLAGS) -o $@ + CGO_ENABLED=0 GOOS=windows GOARCH=arm GOARM=7 $(GO120) build $(BUILDOPTS) $(LDFLAGS) -o $@ $(OUTSUFFIX).android-arm: $(src) CC=$(NDK_CC_ARM) CGO_ENABLED=1 GOOS=android GOARCH=arm GOARM=7 $(GO) build $(LDFLAGS_NATIVE) -o $@