joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-06 01:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/gogio: fix ldflags overwriting

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-05-08 08:27:42 +02:00
parent 630e0b494d
commit bcbea7e653
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/gogio/main.go
+4 -2
View File
@@ -98,8 +98,9 @@ func mainErr() error {
if bi.appID == "" { if bi.appID == "" {
bi.appID = appIDFromPackage(pkgPath) bi.appID = appIDFromPackage(pkgPath)
} }
var ldflags []string
// Pass appID along, to be used for logging on platforms like Android. // Pass appID along, to be used for logging on platforms like Android.
bi.ldflags = fmt.Sprintf("-X gioui.org/app/internal/log.appID=%s", bi.appID) ldflags = append(ldflags, fmt.Sprintf("-X gioui.org/app/internal/log.appID=%s", bi.appID))
switch *target { switch *target {
case "js": case "js":
@@ -115,8 +116,9 @@ func mainErr() error {
} }
if appArgs := flag.Args()[1:]; len(appArgs) > 0 { if appArgs := flag.Args()[1:]; len(appArgs) > 0 {
// Pass along arguments to the app. // Pass along arguments to the app.
bi.ldflags = fmt.Sprintf("-X gioui.org/app.extraArgs=%s", strings.Join(appArgs, "|")) ldflags = append(ldflags, fmt.Sprintf("-X gioui.org/app.extraArgs=%s", strings.Join(appArgs, "|")))
} }
bi.ldflags = strings.Join(ldflags, " ")
if err := build(bi); err != nil { if err := build(bi); err != nil {
return err return err
} }