From 686850e21f7561b002a4ffce3b9d221665c06377 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 5 Apr 2020 20:28:18 +0800 Subject: [PATCH] Fix cross compile (#10952) * Fix cross compile * Add test for cross compile * Fix drone * Fix drone * Also prevent CC environment not to generate Co-authored-by: zeripath --- .drone.yml | 15 +++++++++++++++ Makefile | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index ee23f1ad0..be2d5f85a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -51,6 +51,21 @@ steps: - go build -mod=vendor -o gitea_no_gcc # test if build succeeds without the sqlite tag depends_on: [lint-backend] + - name: build-backend-arm64 + pull: always + image: golang:1.14 + environment: + GO111MODULE: on + GOPROXY: off + GOOS: linux + GOARCH: arm64 + TAGS: bindata + commands: + - curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs + - make build # test cross compile + - rm ./gitea # clean + depends_on: [lint-backend] + - name: build-backend-386 pull: always image: golang:1.14 diff --git a/Makefile b/Makefile index f02340875..df786dccb 100644 --- a/Makefile +++ b/Makefile @@ -481,7 +481,7 @@ backend: go-check generate $(EXECUTABLE) .PHONY: generate generate: $(TAGS_PREREQ) - $(GO) generate -mod=vendor -tags '$(TAGS)' $(GO_PACKAGES) + CC= GOOS= GOARCH= $(GO) generate -mod=vendor -tags '$(TAGS)' $(GO_PACKAGES) $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ) $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@