aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Jarry <robin@jarry.cc>2023-03-05 23:44:16 +0100
committerRobin Jarry <robin@jarry.cc>2023-03-06 23:54:02 +0100
commit4d3b1cb98bee1bed18fa6f47192186f8f3eb6e0e (patch)
treefd2adc399cd0f9e5e4c53fb70bb27135725e9818
parenta603d3de038ae75abddd33078a1c8c56614eaf0d (diff)
downloadaerc-4d3b1cb98bee1bed18fa6f47192186f8f3eb6e0e.tar.gz
mk: remove smart rebuild when GOFLAGS have changed
This was a nice idea but it is very annoying since the flags change every time the git commit changes even if there are no changes to the source files nor the GOFLAGS... Building with different GOFLAGS now requires cleaning first. Signed-off-by: Robin Jarry <robin@jarry.cc> Acked-by: Moritz Poldrack <moritz@poldrack.dev>
-rw-r--r--.gitignore1
-rw-r--r--Makefile14
-rw-r--r--README.md7
3 files changed, 4 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore
index d1d495c5..01aa9c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
/aerc.debug
/wrap
/colorize
-/.aerc.d
/linters.so
race.log.*
raw.log
diff --git a/Makefile b/Makefile
index 781c63b1..dd80a895 100644
--- a/Makefile
+++ b/Makefile
@@ -42,18 +42,8 @@ DOCS := \
all: aerc wrap colorize $(DOCS)
-build_cmd:=$(GO) build $(BUILD_OPTS) $(GOFLAGS) -ldflags "$(GO_LDFLAGS)" -o aerc
-
-# the following command outputs nothing, we only want to execute it once
-# and force .aerc.d to be regenerated when build_cmd has changed
-_!=grep -sqFx '$(build_cmd)' .aerc.d || rm -f .aerc.d
-
-.aerc.d:
- @echo 'GOFLAGS have changed, recompiling'
- @echo '$(build_cmd)' > $@
-
-aerc: $(GOSRC) .aerc.d
- $(build_cmd)
+aerc: $(GOSRC)
+ $(GO) build $(BUILD_OPTS) $(GOFLAGS) -ldflags "$(GO_LDFLAGS)" -o aerc
CC?=cc
CFLAGS?=-O2 -g
diff --git a/README.md b/README.md
index a30020f5..2383a1fb 100644
--- a/README.md
+++ b/README.md
@@ -80,21 +80,18 @@ version of [notmuch](https://notmuchmail.org/#index7h2), including the header
files (notmuch.h). The `notmuch` build tag should be automatically added.
$ make
- GOFLAGS have changed, recompiling
go build -trimpath -tags=notmuch -ldflags "-X ...
^^^^^^^^^^^^^
...
If it is not, you can force it before building:
- $ export GOFLAGS=-tags=notmuch
- $ make
+ $ make GOFLAGS=-tags=notmuch
If you have notmuch headers available but do not want to build notmuch support
in aerc, force GOFLAGS to an empty value:
- $ export GOFLAGS=
- $ make
+ $ make GOFLAGS=
To install aerc locally: