diff options
| author | Omar Polo <op@omarpolo.com> | 2023-06-05 09:45:32 +0200 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2023-06-10 20:10:14 +0200 |
| commit | c4e500c7c107ba9d28d3c15181882e525faf317b (patch) | |
| tree | 5905e6ee8404f87276549950258d464fda343c3e | |
| parent | 06242c6cebde6ce65f0d989327df8c598f057849 (diff) | |
| download | aerc-c4e500c7c107ba9d28d3c15181882e525faf317b.tar.gz aerc-c4e500c7c107ba9d28d3c15181882e525faf317b.zip | |
mk: trim \r from the base64 output
base64 terminates the lines with CRLF and we're currently stripping
only line feeds. The shell then does word-splitting on the carriage
return apparently and it breaks the build. Spotted on OpenBSD.
Signed-off-by: Omar Polo <op@omarpolo.com>
Acked-by: Moritz Poldrack <moritz@poldrack.dev>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -15,7 +15,7 @@ BUILD_OPTS?=-trimpath # ignore environment variable GO_LDFLAGS:= GO_LDFLAGS+=-X main.Version=$(VERSION) -GO_LDFLAGS+=-X main.Flags=$$(echo -- $(GOFLAGS) | base64 | tr -d '\n') +GO_LDFLAGS+=-X main.Flags=$$(echo -- $(GOFLAGS) | base64 | tr -d '\r\n') GO_LDFLAGS+=-X git.sr.ht/~rjarry/aerc/config.shareDir=$(SHAREDIR) GO_LDFLAGS+=-X git.sr.ht/~rjarry/aerc/config.libexecDir=$(LIBEXECDIR) GO_LDFLAGS+=$(GO_EXTRA_LDFLAGS) |