fix: use override GOFLAGS changes from 480defa but keep trimpath usag…

…e as is
ipfs · Sep 9, 2020 · 48b2f12 · 48b2f12
1 parent 2535f4d
commit 48b2f12
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/mk/golang.mk b/mk/golang.mk
@@ -6,12 +6,13 @@ export GO111MODULE=on
 # pre-definitions
 GOCC ?= go
 GOTAGS ?=
-unexport GOFLAGS
-GOFLAGS ?=
 GOTFLAGS ?=
 
+# Unexport GOFLAGS so we only apply it where we actually want it.
+unexport GOFLAGS
+# Override so we can combine with the user's go flags.
 # Try to make building as reproducible as possible by stripping the go path.
-GOFLAGS += "-asmflags=all='-trimpath=$(GOPATH)'" "-gcflags=all='-trimpath=$(GOPATH)'"
+override GOFLAGS += "-asmflags=all='-trimpath=$(GOPATH)'" "-gcflags=all='-trimpath=$(GOPATH)'"
 
 ifeq ($(tarball-is),1)
 	GOFLAGS += -mod=vendor