From 80eb08d995cbdef4743c7bc6aa10a42bdd3757fe Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 16 May 2017 18:04:13 -0400
Subject: run stack setup when building with stack
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

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
-- 
cgit v1.2.3