summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-05-16 18:04:13 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-05-16 18:04:13 -0400
commit80eb08d995cbdef4743c7bc6aa10a42bdd3757fe (patch)
treeb201f145b1158e7a6a3420f616f12383a87fc399
parentb9f904897aec162d407fc5ceef111d0fb5e46ab7 (diff)
run stack setup when building with stack
This gets ghc installed if it's not already. Motivation: Ævar's git test that runs git-annex test using git can be called with BUILDER=stack, but without stack setup being run sometime, the stack build will fail.
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 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