From 46d4721519f80074795a0631f5bab875433a1cc6 Mon Sep 17 00:00:00 2001
From: Anton Evangelatov <anton.evangelatov@gmail.com>
Date: Tue, 31 Jul 2018 15:34:54 +0200
Subject: [PATCH] build: explicitly name all packages to be cross-compiled
(#17288)
---
build/ci.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/build/ci.go b/build/ci.go
index b3a986dca..ff23e15fd 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -147,6 +147,9 @@ var (
debEthereum,
}
+ // Packages to be cross-compiled by the xgo command
+ allCrossCompiledArchiveFiles = append(allToolsArchiveFiles, swarmArchiveFiles...)
+
// Distros for which packages are created.
// Note: vivid is unsupported because there is no golang-1.6 package for it.
// Note: wily is unsupported because it was officially deprecated on lanchpad.
@@ -1009,7 +1012,7 @@ func doXgo(cmdline []string) {
if *alltools {
args = append(args, []string{"--dest", GOBIN}...)
- for _, res := range allToolsArchiveFiles {
+ for _, res := range allCrossCompiledArchiveFiles {
if strings.HasPrefix(res, GOBIN) {
// Binary tool found, cross build it explicitly
args = append(args, "./"+filepath.Join("cmd", filepath.Base(res)))
--
GitLab