summaryrefslogtreecommitdiff
path: root/build.bash
diff options
context:
space:
mode:
authorJakob Unterwurzacher2021-08-18 17:41:33 +0200
committerJakob Unterwurzacher2021-08-18 17:48:38 +0200
commitb2abb0484f249849a771f5810316eab72e0a29e5 (patch)
tree2a912c079957d5101aed7eb29be71a98aa4dd35d /build.bash
parenta5f88e86d186cdbc67e1efabd7aacf389775e027 (diff)
Drop workarounds for Go 1.11 and Go 1.12
Diffstat (limited to 'build.bash')
-rwxr-xr-xbuild.bash14
1 files changed, 1 insertions, 13 deletions
diff --git a/build.bash b/build.bash
index 627a31d..fd2da6c 100755
--- a/build.bash
+++ b/build.bash
@@ -15,10 +15,6 @@ cd "$(dirname "$0")"
# Make sure we have the go binary
go version > /dev/null
-# Enable Go Modules on Go 1.11 and 1.12
-# https://dev.to/maelvls/why-is-go111module-everywhere-and-everything-about-go-modules-24k#-raw-go111module-endraw-with-go-111-and-112
-export GO111MODULE=on
-
# GOPATH may contain multiple paths separated by ":"
GOPATH1=$(go env GOPATH | cut -f1 -d:)
@@ -65,15 +61,7 @@ fi
# Only set GOFLAGS if it is not already set by the user
if [[ -z ${GOFLAGS:-} ]] ; then
- GOFLAGS=""
- # For reproducible builds, we get rid of $HOME references in the
- # binary using "-trimpath".
- # However, -trimpath needs Go 1.13+, and we support Go 1.11 and Go 1.12
- # too. So don't add it there.
- GV=$(go version)
- if [[ $GV != *"1.11"* && $GV != *"1.12"* ]] ; then
- GOFLAGS="-trimpath"
- fi
+ GOFLAGS="-trimpath"
# Also, Fedora and Arch want pie enabled, so enable it.
# * https://fedoraproject.org/wiki/Changes/golang-buildmode-pie
# * https://github.com/rfjakob/gocryptfs/pull/460