From 49c776df4cdd1948c9fedbb4ec4b313969d9dfa1 Mon Sep 17 00:00:00 2001 From: Chris O'Haver Date: Wed, 10 Oct 2018 09:39:31 -0400 Subject: [PATCH] rename VERBOSE to be more generic (#2172) --- Makefile | 4 ++-- Makefile.release | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e81a701d5..d37c77c76 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ GITCOMMIT:=$(shell git describe --dirty --always) BINARY:=coredns SYSTEM:= CHECKS:=check godeps -VERBOSE:=-v +BUILDOPTS:=-v GOPATH?=$(HOME)/go PRESUBMIT:=core coremain plugin test request MAKEPWD:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) @@ -13,7 +13,7 @@ all: coredns .PHONY: coredns coredns: $(CHECKS) - CGO_ENABLED=$(CGO_ENABLED) $(SYSTEM) go build $(VERBOSE) -ldflags="-s -w -X github.com/coredns/coredns/coremain.GitCommit=$(GITCOMMIT)" -o $(BINARY) + CGO_ENABLED=$(CGO_ENABLED) $(SYSTEM) go build $(BUILDOPTS) -ldflags="-s -w -X github.com/coredns/coredns/coremain.GitCommit=$(GITCOMMIT)" -o $(BINARY) .PHONY: check check: presubmit core/zplugin.go core/dnsserver/zdirectives.go godeps diff --git a/Makefile.release b/Makefile.release index 8badff968..837894472 100644 --- a/Makefile.release +++ b/Makefile.release @@ -69,12 +69,12 @@ build: @echo Cleaning old builds @rm -rf build && mkdir build @echo Building: darwin/amd64 - $(VERSION) - mkdir -p build/darwin/amd64 && $(MAKE) coredns BINARY=build/darwin/amd64/$(NAME) SYSTEM="GOOS=darwin GOARCH=amd64" CHECKS="godeps" VERBOSE="" + mkdir -p build/darwin/amd64 && $(MAKE) coredns BINARY=build/darwin/amd64/$(NAME) SYSTEM="GOOS=darwin GOARCH=amd64" CHECKS="godeps" BUILDOPTS="" @echo Building: windows/amd64 - $(VERSION) - mkdir -p build/windows/amd64 && $(MAKE) coredns BINARY=build/windows/amd64/$(NAME).exe SYSTEM="GOOS=windows GOARCH=amd64" CHECKS="" VERBOSE="" + mkdir -p build/windows/amd64 && $(MAKE) coredns BINARY=build/windows/amd64/$(NAME).exe SYSTEM="GOOS=windows GOARCH=amd64" CHECKS="" BUILDOPTS="" @echo Building: linux/$(LINUX_ARCH) - $(VERSION) ;\ for arch in $(LINUX_ARCH); do \ - mkdir -p build/linux/$$arch && $(MAKE) coredns BINARY=build/linux/$$arch/$(NAME) SYSTEM="GOOS=linux GOARCH=$$arch" CHECKS="" VERBOSE="" ;\ + mkdir -p build/linux/$$arch && $(MAKE) coredns BINARY=build/linux/$$arch/$(NAME) SYSTEM="GOOS=linux GOARCH=$$arch" CHECKS="" BUILDOPTS="" ;\ done .PHONY: tar