diff options
| author | pho <pho@pkgsrc.org> | 2020-01-20 14:14:33 +0000 |
|---|---|---|
| committer | pho <pho@pkgsrc.org> | 2020-01-20 14:14:33 +0000 |
| commit | e23237720537bf7a6c965f7070678e5f48456931 (patch) | |
| tree | c663e734adafc7a3588e0119f38a8f18f8745b2e /mk | |
| parent | 5a8cdcb157addcfeec3be075c55354fa57a199ea (diff) | |
| download | pkgsrc-e23237720537bf7a6c965f7070678e5f48456931.tar.gz | |
Build ${WRKSRC}/Setup in the do-configure phase
Doing it in pre-configure makes it unable to do SUBST in that phase.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/haskell.mk | 16 |
1 files changed, 6 insertions, 10 deletions
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} |