mirror of
https://gitlab.com/pulsechaincom/erigon-pulse.git
synced 2024-12-25 04:57:17 +00:00
Merge pull request #3741 from karalabe/fix-makefile-xgo
build: fix xgo argument order when building from make
This commit is contained in:
commit
92e50adfa3
@ -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)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user