summaryrefslogtreecommitdiff
path: root/mk/wrapper
diff options
context:
space:
mode:
authorjlam <jlam>2004-09-22 17:56:31 +0000
committerjlam <jlam>2004-09-22 17:56:31 +0000
commite7dad31103d76ebda8ae153ebd994e5dfd6c4cd5 (patch)
tree8bccb3e8838c59c040d58ce7bfff77067d4a56e3 /mk/wrapper
parent1454c072e14dec738705ae5b0f12630780881173 (diff)
downloadpkgsrc-e7dad31103d76ebda8ae153ebd994e5dfd6c4cd5.tar.gz
Add a toggle that determines whether we pass extra arguments or not. This
is intended to be toggled by a $scan file. Simplify buildlink3 by removing _BLNK_LIBTOOL_LDFLAGS and just setting _WRAP_EXTRA_ARGS.* like all of the other wrappers.
Diffstat (limited to 'mk/wrapper')
-rw-r--r--mk/wrapper/wrapper.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/mk/wrapper/wrapper.sh b/mk/wrapper/wrapper.sh
index d6d029d26f2..32c8a5a31ba 100644
--- a/mk/wrapper/wrapper.sh
+++ b/mk/wrapper/wrapper.sh
@@ -1,6 +1,6 @@
#! @WRAPPER_SHELL@
#
-# $NetBSD: wrapper.sh,v 1.1 2004/09/21 15:01:41 jlam Exp $
+# $NetBSD: wrapper.sh,v 1.2 2004/09/22 17:56:31 jlam Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -52,6 +52,7 @@ transform="@_WRAP_TRANSFORM@"
wrapperlog="${WRAPPER_LOG-@_WRAP_LOG@}"
skip_transform="${WRAPPER_SKIP_TRANSFORM-@_WRAP_SKIP_TRANSFORM@}"
debug="${WRAPPER_DEBUG-no}"
+append_extra_args=yes
cat="@CAT@"
echo="@ECHO@"
@@ -80,7 +81,15 @@ init_queue cmdbuf
. $scan
-set -- "$@" @_WRAP_EXTRA_ARGS@
+case $append_extra_args in
+yes)
+ $debug_log $wrapperlog " (wrapper.sh) append args: @_WRAP_EXTRA_ARGS@"
+ set -- "$@" @_WRAP_EXTRA_ARGS@
+ ;;
+*)
+ ;;
+esac
+
. $arg_source
. $logic
. $cmd_sink