summaryrefslogtreecommitdiff
path: root/mk/wrapper
diff options
context:
space:
mode:
authorjperkin <jperkin>2015-04-27 19:59:07 +0000
committerjperkin <jperkin>2015-04-27 19:59:07 +0000
commit959645edcc6e0efb4d2ef70d5adf4734fff6df5a (patch)
tree0c048ea23e21ffbc04b595ccab1dfa0120d912c5 /mk/wrapper
parentab8a3d8d255f20508e2f7534facdd37930572780 (diff)
downloadpkgsrc-959645edcc6e0efb4d2ef70d5adf4734fff6df5a.tar.gz
Split cwrappers from legacy wrappers. We no longer generate the legacy
wrappers when USE_CWRAPPERS is enabled, saving a reasonable amount of I/O during builds, mostly due to avoiding the transform/untransform sed file generations. WRAPPER_DIR and WRAPPER_BINDIR are used by various packages to override or point to specific wrappers, and these now point to the cwrappers directory when enabled, removing the need for CWRAPPERS_BIN_DIR duplication and fixing packages which previously were using legacy wrappers by accident. A number of targets are now duplicated between bsd.wrapper.mk and cwrappers.mk, the intention being that the legacy wrappers will be deprecated once cwrappers is verified on all supported platforms. If that turns out to take longer than expected, we will probably want to introduce a wrapper.mk to abstract them away before loading the appropriate back-end.
Diffstat (limited to 'mk/wrapper')
-rw-r--r--mk/wrapper/bsd.wrapper.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk
index f2e9416e5f7..8f79a36263e 100644
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.92 2015/04/27 19:38:03 jperkin Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.93 2015/04/27 19:59:07 jperkin Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -56,9 +56,7 @@
# Prepend ${WRAPPER_BINDIR} to the PATH so that the wrappers are found
# first when searching for executables.
#
-.if ${USE_CWRAPPERS:tl} == "no"
PREPEND_PATH+= ${WRAPPER_BINDIR}
-.endif
###
### BEGIN: after the barrier