From 2d66d2146a76fc9810966f28708abc03790a2e89 Mon Sep 17 00:00:00 2001 From: stffabi Date: Tue, 3 May 2022 23:27:13 +0200 Subject: [PATCH] [v2] Improve multi platform builds (#1373) - Make sure to reset the default Arch of the build options and not keep the previous one. - Expand to the full platform in outputBinaries so e.g. `-platform windows` can be used with `-nsis` --- v2/cmd/wails/internal/commands/build/build.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/v2/cmd/wails/internal/commands/build/build.go b/v2/cmd/wails/internal/commands/build/build.go index 22134658a..d64716ef5 100644 --- a/v2/cmd/wails/internal/commands/build/build.go +++ b/v2/cmd/wails/internal/commands/build/build.go @@ -259,10 +259,9 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) { // Calculate platform and arch platformSplit := strings.Split(platform, "/") buildOptions.Platform = platformSplit[0] + buildOptions.Arch = runtime.GOARCH if system.IsAppleSilicon { buildOptions.Arch = "arm64" - } else { - buildOptions.Arch = runtime.GOARCH } if len(platformSplit) == 2 { buildOptions.Arch = platformSplit[1] @@ -330,7 +329,7 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) { // Output stats buildOptions.Logger.Println(fmt.Sprintf("Built '%s' in %s.\n", outputFilename, time.Since(start).Round(time.Millisecond).String())) - outputBinaries[platform] = outputFilename + outputBinaries[buildOptions.Platform+"/"+buildOptions.Arch] = outputFilename }) if targetErr != nil {