diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-03-03 20:36:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-03 20:36:21 +0800 |
| commit | 92e50adfa35d77a3bb286830cf161ede916b1272 (patch) | |
| tree | 78bd2dc7e794d250a44f88d6fd76a2c75d906014 | |
| parent | faf713632c307e3fd77a492481846b858ad991f9 (diff) | |
| parent | 2b284e73665703da61720f9d33b4f3c13b0e04ed (diff) | |
| download | dexon-92e50adfa35d77a3bb286830cf161ede916b1272.tar.gz dexon-92e50adfa35d77a3bb286830cf161ede916b1272.tar.zst dexon-92e50adfa35d77a3bb286830cf161ede916b1272.zip | |
Merge pull request #3741 from karalabe/fix-makefile-xgo
build: fix xgo argument order when building from make
| -rw-r--r-- | build/ci.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/ci.go b/build/ci.go index 05e95b0f1..4ff63fd7f 100644 --- a/build/ci.go +++ b/build/ci.go @@ -930,9 +930,9 @@ func doXgo(cmdline []string) { // If all tools building is requested, build everything the builder wants args := append(buildFlags(env), flag.Args()...) - args = append(args, []string{"--dest", GOBIN}...) if *alltools { + args = append(args, []string{"--dest", GOBIN}...) for _, res := range allToolsArchiveFiles { if strings.HasPrefix(res, GOBIN) { // Binary tool found, cross build it explicitly @@ -945,6 +945,9 @@ func doXgo(cmdline []string) { return } // Otherwise xxecute the explicit cross compilation + path := args[len(args)-1] + args = append(args[:len(args)-1], []string{"--dest", GOBIN, path}...) + xgo := xgoTool(args) build.MustRun(xgo) } |