From 6bfad8fce80fe9bf82c283dc2af4bb311dd94e1d Mon Sep 17 00:00:00 2001 From: Steven Eckhoff Date: Thu, 25 Feb 2021 02:29:14 -0600 Subject: [PATCH] build: Make stupgrades build target conditional (fixes #7199) (#7404) --- build.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.go b/build.go index 10b787d02..7b8b4e81a 100644 --- a/build.go +++ b/build.go @@ -217,7 +217,7 @@ var dependencyRepos = []dependencyRepo{ {path: "xdr", repo: "https://github.com/calmh/xdr.git", commit: "08e072f9cb16"}, } -func init() { +func initTargets() { all := targets["all"] pkgs, _ := filepath.Glob("cmd/*") for _, pkg := range pkgs { @@ -226,6 +226,9 @@ func init() { // ignore dotfiles continue } + if noupgrade && pkg == "stupgrades" { + continue + } all.buildPkgs = append(all.buildPkgs, fmt.Sprintf("github.com/syncthing/syncthing/cmd/%s", pkg)) } targets["all"] = all @@ -257,6 +260,8 @@ func main() { }() } + initTargets() + // Invoking build.go with no parameters at all builds everything (incrementally), // which is what you want for maximum error checking during development. if flag.NArg() == 0 {