From 23b7f2582bb636ac14ab17688be29181af58e9bc Mon Sep 17 00:00:00 2001 From: na4ma4 Date: Tue, 10 Aug 2021 16:18:39 +1000 Subject: [PATCH] GO_MATRIX defaults to empty if GO_MATRIX_ARCH or GO_MATRIX_OS are set --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index ae31be8..805c8d1 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,11 @@ GO_RELEASE_ARGS ?= -v -ldflags "-X main.version=$(GO_APP_VERSION) -s -w" # GO_MATRIX is a whitespace separated set of operating systems and architectures. GOHOSTOS := $(shell go env GOHOSTOS) GOHOSTARCH := $(shell go env GOHOSTARCH) +ifneq ($(GO_MATRIX_ARCH)$(GO_MATRIX_OS),) +GO_MATRIX ?= +else GO_MATRIX ?= $(GOHOSTOS)/$(GOHOSTARCH) +endif # GO_TEST_REQ is a space separated list of prerequisites needed to run tests. GO_TEST_REQ +=