diff options
| author | rillig <rillig@pkgsrc.org> | 2007-11-30 18:54:40 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-11-30 18:54:40 +0000 |
| commit | 3db56436228802847c22441b7bf6701ca4df91fb (patch) | |
| tree | 8fd345647b9f1db25c98aa72b114f0f71b4091ce /mk | |
| parent | 15544482ee7747deef09ce13f7affca54c405572 (diff) | |
| download | pkgsrc-3db56436228802847c22441b7bf6701ca4df91fb.tar.gz | |
Since the "build" target is run inside the pkgsrc barrier, "build-env"
gets the same treatment.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.barrier.mk | 4 | ||||
| -rw-r--r-- | mk/build/build.mk | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mk/bsd.pkg.barrier.mk b/mk/bsd.pkg.barrier.mk index 3f16f8750f9..343f63e67b3 100644 --- a/mk/bsd.pkg.barrier.mk +++ b/mk/bsd.pkg.barrier.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.barrier.mk,v 1.14 2007/08/31 16:30:11 jlam Exp $ +# $NetBSD: bsd.pkg.barrier.mk,v 1.15 2007/11/30 18:54:40 rillig Exp $ _COOKIE.barrier= ${WRKDIR}/.barrier_cookie @@ -19,7 +19,7 @@ _BARRIER_POST_TARGETS+= wrapper _BARRIER_POST_TARGETS+= extract _BARRIER_POST_TARGETS+= patch _BARRIER_POST_TARGETS+= configure -_BARRIER_POST_TARGETS+= build +_BARRIER_POST_TARGETS+= build build-env _BARRIER_POST_TARGETS+= test _BARRIER_POST_TARGETS+= all _BARRIER_POST_TARGETS+= install diff --git a/mk/build/build.mk b/mk/build/build.mk index 6bd0cbb8652..b8b15cb02d3 100644 --- a/mk/build/build.mk +++ b/mk/build/build.mk @@ -1,4 +1,4 @@ -# $NetBSD: build.mk,v 1.13 2007/06/13 20:34:48 rillig Exp $ +# $NetBSD: build.mk,v 1.14 2007/11/30 18:54:40 rillig Exp $ # # This file defines what happens in the build phase, excluding the # self-test, which is defined in test.mk. @@ -159,7 +159,11 @@ post-build: .endif BUILD_ENV_SHELL?= ${SH} +.if defined(_PKGSRC_BARRIER) build-env: .PHONY configure @${STEP_MSG} "Entering the build environment for ${PKGNAME}" ${_PKG_SILENT}${_PKG_DEBUG} \ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILD_ENV_SHELL} +.else +build-env: barrier +.endif |