cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3741 from karalabe/fix-makefile-xgo

Browse Source 
build: fix xgo argument order when building from make
This commit is contained in:
Péter Szilágyi 2017-03-03 14:36:21 +02:00 committed by GitHub
commit 92e50adfa3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/ci.go
View File

@ -930,9 +930,9 @@ func doXgo(cmdline []string) {
// If all tools building is requested, build everything the builder wants // If all tools building is requested, build everything the builder wants
args := append(buildFlags(env), flag.Args()...) args := append(buildFlags(env), flag.Args()...)
args = append(args, []string{"--dest", GOBIN}...)
if *alltools { if *alltools {
args = append(args, []string{"--dest", GOBIN}...)
for _, res := range allToolsArchiveFiles { for _, res := range allToolsArchiveFiles {
if strings.HasPrefix(res, GOBIN) { if strings.HasPrefix(res, GOBIN) {
// Binary tool found, cross build it explicitly // Binary tool found, cross build it explicitly
@ -945,6 +945,9 @@ func doXgo(cmdline []string) {
return return
} }
// Otherwise xxecute the explicit cross compilation // Otherwise xxecute the explicit cross compilation
path := args[len(args)-1]
args = append(args[:len(args)-1], []string{"--dest", GOBIN, path}...)
xgo := xgoTool(args) xgo := xgoTool(args)
build.MustRun(xgo) build.MustRun(xgo)
} }