From 6bdce065dd407503aa6bf26c11c7e1df657049b9 Mon Sep 17 00:00:00 2001 From: Luxferre Date: Sun, 15 Sep 2024 19:21:45 +0300 Subject: [PATCH] Introduced GOBIN variable --- Makefile | 11 ++++++----- src/Makefile | 17 +++++++++-------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index b61df36..4b0896c 100644 --- a/Makefile +++ b/Makefile @@ -5,27 +5,28 @@ DIST = out CROSSPREFIX=x86_64-w64-mingw32 CROSSCC = $(CROSSPREFIX)-gcc CROSSCXX = $(CROSSPREFIX)-g++ +GOBIN ?= go .PHONY: all test clean all: - $(MAKE) -C $(SRC) unix + $(MAKE) -C $(SRC) GOBIN=$(GOBIN) unix $(MAKE) dist headless: - $(MAKE) -C $(SRC) unix-headless + $(MAKE) -C $(SRC) GOBIN=$(GOBIN) unix-headless $(MAKE) dist win64: - $(MAKE) -C $(SRC) win64 + $(MAKE) -C $(SRC) GOBIN=$(GOBIN) win64 $(MAKE) dist win64-cross: - $(MAKE) -C $(SRC) CGO_ENABLED=1 CC=$(CROSSCC) CXX=$(CROSSCXX) win64 + $(MAKE) -C $(SRC) GOBIN=$(GOBIN) CGO_ENABLED=1 CC=$(CROSSCC) CXX=$(CROSSCXX) win64 $(MAKE) dist win64-headless: - $(MAKE) -C $(SRC) win64-headless + $(MAKE) -C $(SRC) GOBIN=$(GOBIN) win64-headless $(MAKE) dist dist: diff --git a/src/Makefile b/src/Makefile index 964e4ca..70227d8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,3 +1,4 @@ +GOBIN ?= go LDFLAGS = -s -w LDFLAGS_WIN = -H windowsgui -s -w GOFLAGS = -trimpath @@ -6,20 +7,20 @@ SOURCES_GUI = $(SOURCES) gui.go BIN = streamgoose unix: - go mod tidy - go build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BIN) $(SOURCES_GUI) + $(GOBIN) mod tidy + $(GOBIN) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BIN) $(SOURCES_GUI) unix-headless: - go mod tidy - go build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BIN) $(SOURCES) + $(GOBIN) mod tidy + $(GOBIN) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BIN) $(SOURCES) win64: - go mod tidy - GOOS=windows GOARCH=amd64 go build $(GOFLAGS) -ldflags "$(LDFLAGS_WIN)" -o $(BIN).exe $(SOURCES_GUI) + $(GOBIN) mod tidy + GOOS=windows GOARCH=amd64 $(GOBIN) build $(GOFLAGS) -ldflags "$(LDFLAGS_WIN)" -o $(BIN).exe $(SOURCES_GUI) win64-headless: - go mod tidy - GOOS=windows GOARCH=amd64 go build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BIN).exe $(SOURCES) + $(GOBIN) mod tidy + GOOS=windows GOARCH=amd64 $(GOBIN) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BIN).exe $(SOURCES) clean: rm $(BIN)