From ad49e01f2571a7f7523abfd6fca87adb3e89dd97 Mon Sep 17 00:00:00 2001
From: Anton Evangelatov <anton.evangelatov@gmail.com>
Date: Thu, 16 May 2019 22:56:22 +0200
Subject: [PATCH] build: remove allCrossCompiledArchiveFiles; inline
 allToolsArchiveFiles

---
 build/ci.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/build/ci.go b/build/ci.go
index 2fd5fc4a7d..3fe08b7324 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -131,9 +131,6 @@ var (
 		debEthereum,
 	}
 
-	// Packages to be cross-compiled by the xgo command
-	allCrossCompiledArchiveFiles = append(allToolsArchiveFiles)
-
 	// 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.
@@ -996,7 +993,9 @@ func doXgo(cmdline []string) {
 
 	if *alltools {
 		args = append(args, []string{"--dest", GOBIN}...)
-		for _, res := range allCrossCompiledArchiveFiles {
+
+		// Packages to be cross-compiled by the xgo command
+		for _, res := range allToolsArchiveFiles {
 			if strings.HasPrefix(res, GOBIN) {
 				// Binary tool found, cross build it explicitly
 				args = append(args, "./"+filepath.Join("cmd", filepath.Base(res)))