diff options
author | Jakob Unterwurzacher | 2020-04-13 16:10:09 +0200 |
---|---|---|
committer | Jakob Unterwurzacher | 2020-04-13 18:06:50 +0200 |
commit | 73436d9419d9ef60b0104a73ffae156d9f871261 (patch) | |
tree | 631b30f0750680d562de7f88c55f589ddd4c053e /build.bash | |
parent | a7d562d1144130f4c12e1eb821ac24210a079e79 (diff) |
travis: fix Go Modules build problems
Diffstat (limited to 'build.bash')
-rwxr-xr-x | build.bash | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -15,7 +15,7 @@ cd "$(dirname "$0")" # Make sure we have the go binary go version > /dev/null -# Make it work on Go 1.11 and 1.12 +# 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 @@ -68,7 +68,12 @@ fi # 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 -export GOFLAGS="${GOFLAGS:--trimpath -buildmode=pie}" +# 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 + export GOFLAGS="${GOFLAGS:--trimpath -buildmode=pie}" +fi GO_LDFLAGS="-X main.GitVersion=$GITVERSION -X main.GitVersionFuse=$GITVERSIONFUSE -X main.BuildDate=$BUILDDATE" |