From d7f95dc97dc395cacc5aed65735546effd7a033d Mon Sep 17 00:00:00 2001 From: TheRealKeto Date: Sun, 8 Aug 2021 00:18:56 -0400 Subject: [PATCH] Various changes and fixes - Remove GOFLAGS variable; it's not needed - Make GOFLAGS variable first on all Go related functions Signed-off-by: TheRealKeto --- Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index b321e544..2d4fca54 100644 --- a/Makefile +++ b/Makefile @@ -2,15 +2,14 @@ TARGET ?= bettercap PACKAGES ?= core firewall log modules network packets session tls PREFIX ?= /usr/local GO ?= go -GOFLAGS ?= all: build build: resources - $(GO) $(GOFLAGS) build -o $(TARGET) . + $(GOFLAGS) $(GO) build -o $(TARGET) . build_with_race_detector: resources - $(GO) $(GOFLAGS) build -race -o $(TARGET) . + $(GOFLAGS) $(GO) build -race -o $(TARGET) . resources: network/manuf.go @@ -25,13 +24,13 @@ docker: @docker build -t bettercap:latest . test: - $(GO) $(GOFLAGS) test -covermode=atomic -coverprofile=cover.out ./... + $(GOFLAGS) $(GO) test -covermode=atomic -coverprofile=cover.out ./... html_coverage: test - $(GO) $(GOFLAGS) tool cover -html=cover.out -o cover.out.html + $(GOFLAGS) $(GO) tool cover -html=cover.out -o cover.out.html benchmark: server_deps - $(GO) $(GOFLAGS) test -v -run=doNotRunTests -bench=. -benchmem ./... + $(GOFLAGS) $(GO) test -v -run=doNotRunTests -bench=. -benchmem ./... fmt: $(GO) fmt -s -w $(PACKAGES) @@ -40,4 +39,4 @@ clean: $(RM) $(TARGET) $(RM) -r build -.PHONY: all build build_with_race_detector resources install docker test html_coverage benchmark fmt clean \ No newline at end of file +.PHONY: all build build_with_race_detector resources install docker test html_coverage benchmark fmt clean