From de186b4a06f484d1e45c640b86ac29c6b5cd3808 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Thu, 25 Oct 2018 17:10:49 -0700 Subject: [PATCH] Revert "make: ensure make fmt is run with -s flag" This reverts commit e8003af3cd7b7a08f8e34233e2071a70245b3c69. --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cf1d54035..448b26f46 100644 --- a/Makefile +++ b/Makefile @@ -36,13 +36,14 @@ GOBUILD := go build -v GOINSTALL := go install -v GOTEST := go test -v -GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*") +GOLIST := go list $(PKG)/... | grep -v '/vendor/' GOLISTCOVER := $(shell go list -f '{{.ImportPath}}' ./... | sed -e 's/^$(ESCPKG)/./') GOLISTLINT := $(shell go list -f '{{.Dir}}' ./... | grep -v 'lnrpc') RM := rm -f CP := cp MAKE := make +XARGS := xargs -L 1 include make/testing_flags.mk @@ -210,7 +211,7 @@ endif fmt: @$(call print, "Formatting source.") - gofmt -l -w -s $(GOFILES_NOVENDOR) + $(GOLIST) | $(XARGS) go fmt -x lint: $(LINT_BIN) @$(call print, "Linting source.")