Skip to content

Commit

Permalink
go: Remove -ldflags=-buildid= workaround
Browse files Browse the repository at this point in the history
The fix for golang/go#33772 has been
backported to Go 1.13 (golang/go#34326) and
is included in the Go 1.13.4 release.
  • Loading branch information
tjanez committed Dec 16, 2019
1 parent 1117444 commit 60641ce
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions go/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 60641ce

Please sign in to comment.