From 20622c8a0673f420029afae287b739965a3bf7b5 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Sat, 30 Dec 2023 20:01:55 -0800 Subject: [PATCH] make.go: don't build pk-mount on darwin, set osusergo, use modern comma-separated tags Signed-off-by: Brad Fitzpatrick --- make.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/make.go b/make.go index f9708c16a..c5ade44ed 100644 --- a/make.go +++ b/make.go @@ -116,15 +116,15 @@ func main() { case "": // Add pk-mount to default build targets on OSes that support FUSE. switch *buildOS { - case "linux", "darwin": + case "linux": targs = append(targs, "perkeep.org/cmd/pk-mount") } default: if *website { - log.Fatal("-targets and -website are mutually exclusive") + log.Fatal("--targets and --website are mutually exclusive") } if *camnetdns { - log.Fatal("-targets and -camnetdns are mutually exclusive") + log.Fatal("--targets and --camnetdns are mutually exclusive") } if t := strings.Split(*targets, ","); len(t) != 0 { targs = t @@ -153,7 +153,7 @@ func main() { tags := []string{"purego"} // for cznic/zappy if *static { - tags = append(tags, "netgo") + tags = append(tags, "netgo", "osusergo") } if *embedResources { tags = append(tags, "with_embed") @@ -179,7 +179,7 @@ func main() { if ldFlags != "" { baseArgs = append(baseArgs, "--ldflags="+ldFlags) } - baseArgs = append(baseArgs, "--tags="+strings.Join(tags, " ")) + baseArgs = append(baseArgs, "--tags="+strings.Join(tags, ",")) // First install command: build just the final binaries, installed to a GOBIN // under /bin: