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
997b5523
Unverified
Commit
997b5523
authored
Jul 23, 2020
by
Felix Lange
Committed by
GitHub
Jul 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: fix GOBIN for gomobile commands (#21361)
parent
4c268e65
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
ci.go
build/ci.go
+3
-2
No files found.
build/ci.go
View file @
997b5523
...
...
@@ -884,11 +884,12 @@ func gomobileTool(subcmd string, args ...string) *exec.Cmd {
"PATH="
+
GOBIN
+
string
(
os
.
PathListSeparator
)
+
os
.
Getenv
(
"PATH"
),
}
for
_
,
e
:=
range
os
.
Environ
()
{
if
strings
.
HasPrefix
(
e
,
"GOPATH="
)
||
strings
.
HasPrefix
(
e
,
"PATH="
)
{
if
strings
.
HasPrefix
(
e
,
"GOPATH="
)
||
strings
.
HasPrefix
(
e
,
"PATH="
)
||
strings
.
HasPrefix
(
e
,
"GOBIN="
)
{
continue
}
cmd
.
Env
=
append
(
cmd
.
Env
,
e
)
}
cmd
.
Env
=
append
(
cmd
.
Env
,
"GOBIN="
+
GOBIN
)
return
cmd
}
...
...
@@ -957,7 +958,7 @@ func doXCodeFramework(cmdline []string) {
if
*
local
{
// If we're building locally, use the build folder and stop afterwards
bind
.
Dir
,
_
=
filepath
.
Abs
(
GOBIN
)
bind
.
Dir
=
GOBIN
build
.
MustRun
(
bind
)
return
}
...
...
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