From bcbea7e65371e81e2351467dd9a7aa8d8cec117b Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 8 May 2020 08:27:42 +0200 Subject: [PATCH] cmd/gogio: fix ldflags overwriting Signed-off-by: Elias Naur --- cmd/gogio/main.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/gogio/main.go b/cmd/gogio/main.go index cf0ec9c5..e63b1da9 100644 --- a/cmd/gogio/main.go +++ b/cmd/gogio/main.go @@ -98,8 +98,9 @@ func mainErr() error { if bi.appID == "" { bi.appID = appIDFromPackage(pkgPath) } + var ldflags []string // 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 { case "js": @@ -115,8 +116,9 @@ func mainErr() error { } if appArgs := flag.Args()[1:]; len(appArgs) > 0 { // 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 { return err }