diff options
| author | obache <obache@pkgsrc.org> | 2014-02-05 06:24:27 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2014-02-05 06:24:27 +0000 |
| commit | f7f42782263efd34a5c156fb8db36be8097b41f1 (patch) | |
| tree | 32d2a8864bbdf1ee3a784c809d1398fe6fc2d9cc | |
| parent | 0e1977f37536e709b71d23c8a48f5db0266537c7 (diff) | |
| download | pkgsrc-f7f42782263efd34a5c156fb8db36be8097b41f1.tar.gz | |
move requirement of bootstrap target to pre-bootstrap target.
| -rw-r--r-- | lang/ghc7/bootstrap.mk | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/lang/ghc7/bootstrap.mk b/lang/ghc7/bootstrap.mk index 48ed11ec922..b3b229fc680 100644 --- a/lang/ghc7/bootstrap.mk +++ b/lang/ghc7/bootstrap.mk @@ -1,4 +1,4 @@ -# $NetBSD: bootstrap.mk,v 1.7 2014/02/03 09:48:44 obache Exp $ +# $NetBSD: bootstrap.mk,v 1.8 2014/02/05 06:24:27 obache Exp $ # ----------------------------------------------------------------------------- # Select a bindist of bootstrapping compiler based on a per-platform # basis. @@ -80,15 +80,21 @@ pre-configure: #BUILDLINK_PASSTHRU_DIRS= ${PREFIX}/lib/${PKGNAME_NOREV} -.if exists(${WRKDIR}/${DISTNAME:S/-src$//}/mk/config.mk) -bootstrap: - @${ERROR_MSG} "You have already configured the package in a way\ - that building bootstrapping compiler is impossible." - @${FAIL_MSG} "Please run \"${MAKE} clean patch\" first." -.else -bootstrap: patch .WAIT ${WRKDIR}/${BOOT_ARCHIVE} +bootstrap: pre-bootstrap .WAIT ${WRKDIR}/${BOOT_ARCHIVE} @${PHASE_MSG} "Done creating" ${WRKDIR}/${BOOT_ARCHIVE} + +.PHONY: pre-bootstrap +pre-bootstrap: + @${TEST} \! -f ${_COOKIE.configure} || \ + (${ERROR_MSG} "You have already configured the package in a way\ + that building bootstrapping compiler is impossible."; \ + ${FAIL_MSG} "Please run \"${MAKE} clean patch\" first."); + @${TEST} -f ${_COOKIE.patch} || \ + ${FAIL_MSG} "Please run \"${MAKE} patch\" first." + @${DO_NADA} + + ${WRKDIR}/lndir: @${PHASE_MSG} "Building lndir(1) to duplicate the source tree." cd ${WRKSRC:Q}/utils/lndir && \ @@ -135,4 +141,3 @@ ${WRKDIR}/${BOOT_TARBALL}: ${WRKDIR}/stamp-build-boot ${WRKDIR}/${BOOT_ARCHIVE}: ${WRKDIR}/${BOOT_TARBALL} @${PHASE_MSG} "Compressing binary distribution of bootstrapping ${PKGNAME_NOREV}" ${XZ} --verbose -9 --extreme ${WRKDIR:Q}/${BOOT_TARBALL} -.endif |