From 60641ce41a9c2402f1b539375e1dd4e0eb45272d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tadej=20Jane=C5=BE?= Date: Fri, 6 Dec 2019 14:22:39 +0100 Subject: [PATCH] go: Remove -ldflags=-buildid= workaround The fix for https://github.com/golang/go/issues/33772 has been backported to Go 1.13 (https://github.com/golang/go/issues/34326) and is included in the Go 1.13.4 release. --- go/Makefile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/go/Makefile b/go/Makefile index 0f37e98daa9..8d5e10bea39 100644 --- a/go/Makefile +++ b/go/Makefile @@ -1,15 +1,9 @@ SHELL = /bin/bash OASIS_GO ?= go -# The following flags enable additional behavior for deterministic builds. -# -# * -trimpath as of Go 1.13 will strip all host dependent filesystem paths -# from binaries. -# -# * -ldflags=-buildid= will set the `.note.go.buildid` section to empty, -# to work around https://github.com/golang/go/issues/33772. Once we -# migrate to a version of Go that has the fix, it can be removed. -GOFLAGS ?= -trimpath -ldflags=-buildid= -v +# NOTE: The -trimpath flag strips all host dependent filesystem paths from +# binaries which is required for deterministic builds. +GOFLAGS ?= -trimpath -v # Append git HEAD commit to the oasis node version, if git command exists and # this folder is in some git repository. Use a truncated commit hash and append