diff --git a/Makefile b/Makefile
index 0958edb50e..8ab031c5ea 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