Merge pull request #544 from mpldr/makefile-improvements

juanfont · Apr 12, 2022 · 556ca5f · 556ca5f
2 parents 6eeee8e + 93682ab
commit 556ca5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 41 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # Calculate version
-version = $(shell ./scripts/version-at-commit.sh)
+version = $(git describe --always --tags --dirty)
 
 rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
 
@@ -10,7 +10,7 @@ PROTO_SOURCES = $(call rwildcard,,*.proto)
 
 
 build:
-	GGO_ENABLED=0 go build -ldflags "-s -w -X github.com/juanfont/headscale/cmd/headscale/cli.Version=$(version)" cmd/headscale/headscale.go
+	CGO_ENABLED=0 go build -trimpath -buildmode=pie -mod=readonly -ldflags "-s -w -X github.com/juanfont/headscale/cmd/headscale/cli.Version=$(version)" cmd/headscale/headscale.go
 
 dev: lint test build
 

diff --git a/scripts/version-at-commit.sh b/scripts/version-at-commit.sh