Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
92e50adf
Commit
92e50adf
authored
Mar 03, 2017
by
Péter Szilágyi
Committed by
GitHub
Mar 03, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3741 from karalabe/fix-makefile-xgo
build: fix xgo argument order when building from make
parents
faf71363
2b284e73
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
ci.go
build/ci.go
+4
-1
No files found.
build/ci.go
View file @
92e50adf
...
...
@@ -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
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment