Commit 49c776df authored by Chris O'Haver's avatar Chris O'Haver Committed by GitHub

rename VERBOSE to be more generic (#2172)

parent 288aef5f
...@@ -3,7 +3,7 @@ GITCOMMIT:=$(shell git describe --dirty --always) ...@@ -3,7 +3,7 @@ GITCOMMIT:=$(shell git describe --dirty --always)
BINARY:=coredns BINARY:=coredns
SYSTEM:= SYSTEM:=
CHECKS:=check godeps CHECKS:=check godeps
VERBOSE:=-v BUILDOPTS:=-v
GOPATH?=$(HOME)/go GOPATH?=$(HOME)/go
PRESUBMIT:=core coremain plugin test request PRESUBMIT:=core coremain plugin test request
MAKEPWD:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) MAKEPWD:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
...@@ -13,7 +13,7 @@ all: coredns ...@@ -13,7 +13,7 @@ all: coredns
.PHONY: coredns .PHONY: coredns
coredns: $(CHECKS) 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 .PHONY: check
check: presubmit core/zplugin.go core/dnsserver/zdirectives.go godeps check: presubmit core/zplugin.go core/dnsserver/zdirectives.go godeps
......
...@@ -69,12 +69,12 @@ build: ...@@ -69,12 +69,12 @@ build:
@echo Cleaning old builds @echo Cleaning old builds
@rm -rf build && mkdir build @rm -rf build && mkdir build
@echo Building: darwin/amd64 - $(VERSION) @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) @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) ;\ @echo Building: linux/$(LINUX_ARCH) - $(VERSION) ;\
for arch in $(LINUX_ARCH); do \ 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 done
.PHONY: tar .PHONY: tar
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment