Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert Go trimpath #7665

Merged
merged 2 commits into from
Sep 9, 2020
Merged

Revert Go trimpath #7665

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0471730
Revert "fix: override GOFLAGS"
aschmahmann Sep 9, 2020
c80cde9
fix: use override GOFLAGS changes from 480defab689610550ee3d346e31441…
aschmahmann Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mk/golang.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ GOTFLAGS ?=

# Unexport GOFLAGS so we only apply it where we actually want it.
unexport GOFLAGS
# Try to make building as reproducible as possible by stripping the go path.
# Override so we can combine with the user's go flags.
override GOFLAGS += -trimpath
# Try to make building as reproducible as possible by stripping the go path.
override GOFLAGS += "-asmflags=all='-trimpath=$(GOPATH)'" "-gcflags=all='-trimpath=$(GOPATH)'"
Comment on lines 13 to +15
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could also just remove these 3 lines entirely and not worry about reproducible builds that aren't using our dist build script from https://github.com/ipfs/distributions. At some point we could add in some make flag like make build-reproducible that uses the dist build script.

However, leaving this in and keeping behavior the same seems reasonable for now.


ifeq ($(tarball-is),1)
GOFLAGS += -mod=vendor
Expand Down