From afe41de6b3e64aeef3a094bf43d638538b59e7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Fri, 4 Nov 2016 13:48:20 +0200 Subject: travis: build to all supported linux architectures (#3235) --- build/ci.go | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'build') diff --git a/build/ci.go b/build/ci.go index c6c6f61c9..f3882a1e7 100644 --- a/build/ci.go +++ b/build/ci.go @@ -158,6 +158,13 @@ func doInstall(cmdline []string) { build.MustRun(goinstall) return } + // If we are cross compiling to ARMv5 ARMv6 or ARMv7, clean any prvious builds + if *arch == "arm" { + os.RemoveAll(filepath.Join(runtime.GOROOT(), "pkg", runtime.GOOS+"_arm")) + for _, path := range filepath.SplitList(build.GOPATH()) { + os.RemoveAll(filepath.Join(path, "pkg", runtime.GOOS+"_arm")) + } + } // Seems we are cross compiling, work around forbidden GOBIN goinstall := goToolArch(*arch, "install", buildFlags(env)...) goinstall.Args = append(goinstall.Args, "-v") @@ -318,6 +325,9 @@ func doArchive(cmdline []string) { func archiveBasename(arch string, env build.Environment) string { platform := runtime.GOOS + "-" + arch + if arch == "arm" { + platform += os.Getenv("GOARM") + } archive := platform + "-" + build.VERSION() if isUnstableBuild(env) { archive += "-unstable" -- cgit v1.2.3