From e23237720537bf7a6c965f7070678e5f48456931 Mon Sep 17 00:00:00 2001
From: pho <pho@pkgsrc.org>
Date: Mon, 20 Jan 2020 14:14:33 +0000
Subject: Build ${WRKSRC}/Setup in the do-configure phase

Doing it in pre-configure makes it unable to do SUBST in that phase.
---
 mk/haskell.mk | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'mk')

diff --git a/mk/haskell.mk b/mk/haskell.mk
index 78748db6cf2..c7fcccab635 100644
--- a/mk/haskell.mk
+++ b/mk/haskell.mk
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.14 2020/01/19 23:45:06 pho Exp $
+# $NetBSD: haskell.mk,v 1.15 2020/01/20 14:14:33 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages.
 # See: http://www.haskell.org/cabal/
@@ -226,18 +226,14 @@ _check-ignored-plist: error-check
 	fi
 .endif
 
-# We might not have any working Haskell interpreter so compile
-# Setup.?hs to a binary. Since dynamic linkage is much faster, we try
-# it and then fall back to static linkage if that didn't work.
-pre-configure: ${WRKSRC}/Setup
-
-${WRKSRC}/Setup:
+# Define configure target. We might not have any working Haskell
+# interpreter so compile Setup.?hs to a binary. Since dynamic linkage
+# is much faster, we try it and then fall back to static linkage if
+# that didn't work.
+do-configure:
 	${RUN}cd ${WRKSRC} && \
 		( ${_HASKELL_BIN:Q} --make Setup -dynamic || \
 			${_HASKELL_BIN:Q} --make Setup -static )
-
-# Define configure target.
-do-configure:
 	${RUN}cd ${WRKSRC:Q} && \
 		${SETENV} ${CONFIGURE_ENV} \
 			./Setup configure ${PKG_VERBOSE:D-v} ${CONFIGURE_ARGS}
-- 
cgit v1.2.3