summaryrefslogtreecommitdiff
path: root/mk/wrapper
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-04-26 07:59:58 +0000
committertnn <tnn@pkgsrc.org>2015-04-26 07:59:58 +0000
commit50b733c029ae0cb9cd3900e403aecd70f917c106 (patch)
treea3b8f94d952f3671db39ed83a9242dac13cc2fdb /mk/wrapper
parentdef0700b7e18dbacd0d0670f8c43372936e37fe3 (diff)
downloadpkgsrc-50b733c029ae0cb9cd3900e403aecd70f917c106.tar.gz
revert rev. 1.7. Although it should be correct in theory it interacts
with the build of some packages in subtle ways, and needs more testing.
Diffstat (limited to 'mk/wrapper')
-rw-r--r--mk/wrapper/buildcmd5
1 files changed, 2 insertions, 3 deletions
diff --git a/mk/wrapper/buildcmd b/mk/wrapper/buildcmd
index 15691db98bb..24cc5b51569 100644
--- a/mk/wrapper/buildcmd
+++ b/mk/wrapper/buildcmd
@@ -1,4 +1,4 @@
-# $NetBSD: buildcmd,v 1.8 2015/04/25 22:26:41 wiz Exp $
+# $NetBSD: buildcmd,v 1.9 2015/04/26 07:59:58 tnn Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -68,10 +68,9 @@ case $arg in
######################################################################
# Treat the '--as-needed' and '--no-as-needed' arguments to ld as if
# they are libraries so that they still surround the given library.
-# Same for '-Wl,--whole-archive' and '-Wl,--no-whole-archive'.
# WARNING: this may not work if the wrapper reorders libraries.
######################################################################
--l*|--as-needed|--no-as-needed|-Wl,--whole-archive|-Wl,--no-whole-archive)
+-l*|--as-needed|--no-as-needed)
case $libs in
*" "$arg)
;;