aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Chris O'Haver <cohaver@infoblox.com> 2018-10-10 09:39:31 -0400
committerGravatar GitHub <noreply@github.com> 2018-10-10 09:39:31 -0400
commit49c776df4cdd1948c9fedbb4ec4b313969d9dfa1 (patch)
tree6b38d8044528a36af186fec80f366cfa70f2e17d
parent288aef5f2b459416bebaa71d0b9198d8dd23ad8b (diff)
downloadcoredns-49c776df4cdd1948c9fedbb4ec4b313969d9dfa1.tar.gz
coredns-49c776df4cdd1948c9fedbb4ec4b313969d9dfa1.tar.zst
coredns-49c776df4cdd1948c9fedbb4ec4b313969d9dfa1.zip
rename VERBOSE to be more generic (#2172)
-rw-r--r--Makefile4
-rw-r--r--Makefile.release6
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