summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--doc/devblog/day_459__git_bug.mdwn3
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 0958edb50..8ab031c5e 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,8 @@ tmp/configure-stamp: Build/TestConfig.hs Build/Configure.hs
if [ "$(BUILDER)" = ./Setup ]; then ghc --make Setup; fi
if [ "$(BUILDER)" != stack ]; then \
$(BUILDER) configure --ghc-options="$(shell Build/collect-ghc-options.sh)"; \
+ else \
+ $(BUILDER) setup; \
fi
mkdir -p tmp
touch tmp/configure-stamp
diff --git a/doc/devblog/day_459__git_bug.mdwn b/doc/devblog/day_459__git_bug.mdwn
index 3079904ac..3ec5f167f 100644
--- a/doc/devblog/day_459__git_bug.mdwn
+++ b/doc/devblog/day_459__git_bug.mdwn
@@ -10,7 +10,8 @@ workaround out. It's not a super bad bug, but it does make the test suite
fail and I've already had 3 people report the problem.
Seems it would be good to have an integration test that runs git-annex's
-test suite against new commits to git.
+test suite against new commits to git. Ævar Arnfjörð Bjarmason has stepped
+up to add that to git's test suite.
----