| From 689e3abb7a45fa9e6bffd4ce39f712397f280279 Mon Sep 17 00:00:00 2001 |
| From: Xuewei Zhang <xueweiz@google.com> |
| Date: Thu, 5 Mar 2020 12:29:37 -0800 |
| Subject: [PATCH] lakitu: Use specified Go compiler for cross compilation |
| |
| --- |
| Makefile | 12 ++++++------ |
| 1 file changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/Makefile b/Makefile |
| index c6e8285..75b4097 100644 |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -76,9 +76,9 @@ ifeq ($(ENABLE_JOURNALD), 1) |
| endif |
| |
| vet: |
| - GO111MODULE=on go list -mod vendor -tags "$(BUILD_TAGS)" ./... | \ |
| + GO111MODULE=on ${GO} list -mod vendor -tags "$(BUILD_TAGS)" ./... | \ |
| grep -v "./vendor/*" | \ |
| - GO111MODULE=on xargs go vet -mod vendor -tags "$(BUILD_TAGS)" |
| + GO111MODULE=on xargs ${GO} vet -mod vendor -tags "$(BUILD_TAGS)" |
| |
| fmt: |
| find . -type f -name "*.go" | grep -v "./vendor/*" | xargs gofmt -s -w -l |
| @@ -88,7 +88,7 @@ version: |
| |
| ./bin/log-counter: $(PKG_SOURCES) |
| ifeq ($(ENABLE_JOURNALD), 1) |
| - CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GO111MODULE=on go build \ |
| + CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GO111MODULE=on ${GO} build \ |
| -mod vendor \ |
| -o bin/log-counter \ |
| -ldflags '-X $(PKG)/pkg/version.version=$(VERSION)' \ |
| @@ -99,7 +99,7 @@ else |
| endif |
| |
| ./bin/node-problem-detector: $(PKG_SOURCES) |
| - CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GO111MODULE=on go build \ |
| + CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GO111MODULE=on ${GO} build \ |
| -mod vendor \ |
| -o bin/node-problem-detector \ |
| -ldflags '-X $(PKG)/pkg/version.version=$(VERSION)' \ |
| @@ -107,7 +107,7 @@ endif |
| ./cmd/nodeproblemdetector |
| |
| ./test/bin/problem-maker: $(PKG_SOURCES) |
| - CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GO111MODULE=on go build \ |
| + CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GO111MODULE=on ${GO} build \ |
| -mod vendor \ |
| -o test/bin/problem-maker \ |
| -tags "$(BUILD_TAGS)" \ |
| @@ -122,7 +122,7 @@ endif |
| |
| |
| test: vet fmt |
| - GO111MODULE=on go test -mod vendor -timeout=1m -v -race -short -tags "$(BUILD_TAGS)" ./... |
| + GO111MODULE=on ${GO} test -mod vendor -timeout=1m -v -race -short -tags "$(BUILD_TAGS)" ./... |
| |
| e2e-test: vet fmt build-tar |
| GO111MODULE=on ginkgo -nodes=$(PARALLEL) -mod vendor -timeout=10m -v -tags "$(BUILD_TAGS)" -stream \ |
| -- |
| 2.25.0.265.gbab2e86ba0-goog |
| |
