aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2018-01-02 18:28:07 +0800
committerFelix Lange <fjl@users.noreply.github.com>2018-01-02 18:28:07 +0800
commit2fe07c203ee7ceae313cedc236d8ef7771768c1c (patch)
tree07a544a3be29d2800f83a8b0a74b75bcd88b6b75 /build
parent6882943e3921b2c51d4ae079d9e5720aa7c90c7a (diff)
downloaddexon-2fe07c203ee7ceae313cedc236d8ef7771768c1c.tar
dexon-2fe07c203ee7ceae313cedc236d8ef7771768c1c.tar.gz
dexon-2fe07c203ee7ceae313cedc236d8ef7771768c1c.tar.bz2
dexon-2fe07c203ee7ceae313cedc236d8ef7771768c1c.tar.lz
dexon-2fe07c203ee7ceae313cedc236d8ef7771768c1c.tar.xz
dexon-2fe07c203ee7ceae313cedc236d8ef7771768c1c.tar.zst
dexon-2fe07c203ee7ceae313cedc236d8ef7771768c1c.zip
build: fix version comparison for go1.10 and beyond (#15781)
Diffstat (limited to 'build')
-rw-r--r--build/ci.go21
1 files changed, 15 insertions, 6 deletions
diff --git a/build/ci.go b/build/ci.go
index 987f0bb18..37d8c0969 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -179,11 +179,17 @@ func doInstall(cmdline []string) {
// Check Go version. People regularly open issues about compilation
// failure with outdated Go. This should save them the trouble.
- if runtime.Version() < "go1.7" && !strings.Contains(runtime.Version(), "devel") {
- log.Println("You have Go version", runtime.Version())
- log.Println("go-ethereum requires at least Go version 1.7 and cannot")
- log.Println("be compiled with an earlier version. Please upgrade your Go installation.")
- os.Exit(1)
+ if !strings.Contains(runtime.Version(), "devel") {
+ // Figure out the minor version number since we can't textually compare (1.10 < 1.7)
+ var minor int
+ fmt.Sscanf(strings.TrimPrefix(runtime.Version(), "go1."), "%d", &minor)
+
+ if minor < 7 {
+ log.Println("You have Go version", runtime.Version())
+ log.Println("go-ethereum requires at least Go version 1.7 and cannot")
+ log.Println("be compiled with an earlier version. Please upgrade your Go installation.")
+ os.Exit(1)
+ }
}
// Compile packages given as arguments, or everything if there are no arguments.
packages := []string{"./..."}
@@ -257,7 +263,10 @@ func goToolArch(arch string, subcmd string, args ...string) *exec.Cmd {
if subcmd == "build" || subcmd == "install" || subcmd == "test" {
// Go CGO has a Windows linker error prior to 1.8 (https://github.com/golang/go/issues/8756).
// Work around issue by allowing multiple definitions for <1.8 builds.
- if runtime.GOOS == "windows" && runtime.Version() < "go1.8" {
+ var minor int
+ fmt.Sscanf(strings.TrimPrefix(runtime.Version(), "go1."), "%d", &minor)
+
+ if runtime.GOOS == "windows" && minor < 8 {
cmd.Args = append(cmd.Args, []string{"-ldflags", "-extldflags -Wl,--allow-multiple-definition"}...)
}
}