Revert "fix: override GOFLAGS"
This reverts commit 480defab689610550ee3d346e31441a2bb881fcb. (cherry picked from commit 2535f4de829d352ae47b56589dd2734cb69a193c)
Adin Schmahmann committed
Sep 9, 2020 at 13:43 UTC
a166989ecb908e25c6c07337bf76a4be9c524b0d
1 file changed
+3
-4
mk/golang.mk
+3
-4
@@ -6,13 +6,12 @@ export GO111MODULE=on
6
# pre-definitions
7
GOCC ?= go
8
GOTAGS ?=
9
+unexport GOFLAGS
10
+GOFLAGS ?=
11
GOTFLAGS ?=
12
11
-# Unexport GOFLAGS so we only apply it where we actually want it.
12
-unexport GOFLAGS
13
# Try to make building as reproducible as possible by stripping the go path.
14
-# Override so we can combine with the user's go flags.
15
-override GOFLAGS += -trimpath
14
+GOFLAGS += "-asmflags=all='-trimpath=$(GOPATH)'" "-gcflags=all='-trimpath=$(GOPATH)'"
15
16
ifeq ($(tarball-is),1)
17
GOFLAGS += -mod=vendor