From 2fe07c203ee7ceae313cedc236d8ef7771768c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 2 Jan 2018 12:28:07 +0200
Subject: build: fix version comparison for go1.10 and beyond (#15781)
---
build/ci.go | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
(limited to 'build')
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"}...)
}
}
--
cgit v1.2.3
From 3e0113fff4b83c2d398f5d5041ef8b3052c19819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 2 Jan 2018 12:40:56 +0200
Subject: build: set CC through a command-line flag (#15784)
This avoids setting CC for the go run invocation, which fails on go1.10.
---
build/ci.go | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
(limited to 'build')
diff --git a/build/ci.go b/build/ci.go
index 37d8c0969..1f98bb843 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -23,7 +23,7 @@ Usage: go run build/ci.go <command> <command flags/arguments>
Available commands are:
- install [ -arch architecture ] [ packages... ] -- builds packages and executables
+ install [ -arch architecture ] [ -cc compiler ] [ packages... ] -- builds packages and executables
test [ -coverage ] [ packages... ] -- runs the tests
lint -- runs certain pre-selected linters
archive [ -arch architecture ] [ -type zip|tar ] [ -signer key-envvar ] [ -upload dest ] -- archives build artefacts
@@ -173,6 +173,7 @@ func main() {
func doInstall(cmdline []string) {
var (
arch = flag.String("arch", "", "Architecture to cross build for")
+ cc = flag.String("cc", "", "C compiler to cross build with")
)
flag.CommandLine.Parse(cmdline)
env := build.Env()
@@ -213,7 +214,7 @@ func doInstall(cmdline []string) {
}
}
// Seems we are cross compiling, work around forbidden GOBIN
- goinstall := goToolArch(*arch, "install", buildFlags(env)...)
+ goinstall := goToolArch(*arch, *cc, "install", buildFlags(env)...)
goinstall.Args = append(goinstall.Args, "-v")
goinstall.Args = append(goinstall.Args, []string{"-buildmode", "archive"}...)
goinstall.Args = append(goinstall.Args, packages...)
@@ -227,7 +228,7 @@ func doInstall(cmdline []string) {
}
for name := range pkgs {
if name == "main" {
- gobuild := goToolArch(*arch, "build", buildFlags(env)...)
+ gobuild := goToolArch(*arch, *cc, "build", buildFlags(env)...)
gobuild.Args = append(gobuild.Args, "-v")
gobuild.Args = append(gobuild.Args, []string{"-o", executablePath(cmd.Name())}...)
gobuild.Args = append(gobuild.Args, "."+string(filepath.Separator)+filepath.Join("cmd", cmd.Name()))
@@ -255,10 +256,10 @@ func buildFlags(env build.Environment) (flags []string) {
}
func goTool(subcmd string, args ...string) *exec.Cmd {
- return goToolArch(runtime.GOARCH, subcmd, args...)
+ return goToolArch(runtime.GOARCH, os.Getenv("CC"), subcmd, args...)
}
-func goToolArch(arch string, subcmd string, args ...string) *exec.Cmd {
+func goToolArch(arch string, cc string, subcmd string, args ...string) *exec.Cmd {
cmd := build.GoTool(subcmd, args...)
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).
@@ -277,6 +278,9 @@ func goToolArch(arch string, subcmd string, args ...string) *exec.Cmd {
cmd.Env = append(cmd.Env, "CGO_ENABLED=1")
cmd.Env = append(cmd.Env, "GOARCH="+arch)
}
+ if cc != "" {
+ cmd.Env = append(cmd.Env, "CC="+cc)
+ }
for _, e := range os.Environ() {
if strings.HasPrefix(e, "GOPATH=") || strings.HasPrefix(e, "GOBIN=") {
continue
--
cgit v1.2.3