From 7d58309a4f21d9ca1ce5680df6e05f492d58bbc5 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Thu, 8 Dec 2016 10:49:36 -0500 Subject: [PATCH] Makefile: run "go" with $(BUILDTAGS) Run the "go" command with the $(BUILDTAGS) makefile variable passed in as build tags. We don't currently set it, but we'll need to eventually, and adding it now does no harm. Signed-off-by: Nalin Dahyabhai --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ed4b9516..2720cb8e 100644 --- a/Makefile +++ b/Makefile @@ -52,10 +52,10 @@ binary-static: cmd/skopeo # Build w/o using Docker containers binary-local: - go build -ldflags "-X main.gitCommit=${GIT_COMMIT}" -gcflags "$(GOGCFLAGS)" -o skopeo ./cmd/skopeo + go build -ldflags "-X main.gitCommit=${GIT_COMMIT}" -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o skopeo ./cmd/skopeo binary-local-static: - go build -ldflags "-extldflags \"-static\" -X main.gitCommit=${GIT_COMMIT}" -gcflags "$(GOGCFLAGS)" -o skopeo ./cmd/skopeo + go build -ldflags "-extldflags \"-static\" -X main.gitCommit=${GIT_COMMIT}" -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o skopeo ./cmd/skopeo build-container: docker build ${DOCKER_BUILD_ARGS} -t "$(DOCKER_IMAGE)" . @@ -106,4 +106,4 @@ validate-local: hack/make.sh validate-git-marks validate-gofmt validate-lint validate-vet test-unit-local: - go test $$(go list -e ./... | grep -v '^github\.com/projectatomic/skopeo/\(integration\|vendor/.*\)$$') + go test -tags "$(BUILDTAGS)" $$(go list -tags "$(BUILDTAGS)" -e ./... | grep -v '^github\.com/projectatomic/skopeo/\(integration\|vendor/.*\)$$')