diff options
| author | rillig <rillig@pkgsrc.org> | 2019-05-07 19:36:43 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-05-07 19:36:43 +0000 |
| commit | e69a8e6b9a2ec1fe26f4213b89531a5debabf312 (patch) | |
| tree | dd6c3ae5f569aa6abe76820becfd3a45899a0f05 /mk/wrapper | |
| parent | 0e83f609c5e5acb21481227c510239f9ad2cbe2c (diff) | |
| download | pkgsrc-e69a8e6b9a2ec1fe26f4213b89531a5debabf312.tar.gz | |
mk: allow "bmake clean depends" as shortcut
When "bmake clean depends" was called for a package where the various
cookie files already existed, these would enable different rules than a
clean package directory.
Since "bmake clean" deletes all the cookie files before "bmake depends"
starts, in these combined command lines the cookie files must be treated
as absent.
Diffstat (limited to 'mk/wrapper')
| -rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index c51c40729a3..1b620bde08d 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.100 2018/08/22 20:48:37 maya Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.101 2019/05/07 19:36:44 rillig Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -54,7 +54,7 @@ PREPEND_PATH+= ${WRAPPER_BINDIR} ### ### BEGIN: after the barrier ### -.if exists(${_COOKIE.barrier}) +.if exists(${_COOKIE.barrier}) && !${_CLEANING} _WRAPPER_DEBUG?= no CONFIGURE_ENV+= WRAPPER_DEBUG=${_WRAPPER_DEBUG:Q} @@ -708,7 +708,7 @@ _COOKIE.wrapper= ${WRKDIR}/.wrapper_done .PHONY: wrapper .if !target(wrapper) -. if exists(${_COOKIE.wrapper}) +. if exists(${_COOKIE.wrapper}) && !${_CLEANING} wrapper: @${DO_NADA} . elif defined(_PKGSRC_BARRIER) @@ -722,7 +722,7 @@ wrapper: barrier acquire-wrapper-lock: acquire-lock release-wrapper-lock: release-lock -.if exists(${_COOKIE.wrapper}) +.if exists(${_COOKIE.wrapper}) && !${_CLEANING} ${_COOKIE.wrapper}: @${DO_NADA} .else |