Introduce a command sink for ld(1) with MKPIE

When not using cwrappers, so far PKGSRC_MKPIE was only automatically
applied when linking using gcc(1) (when enabled). This is now also the
case for packages using ld(1) to link executables.

2 files changed, 41 insertions, 1 deletions

diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk
index de86dad58a5..fe45f0a8891 100644
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.98 2017/11/16 00:36:10 khorben Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.99 2017/11/16 02:16:56 khorben Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -314,6 +314,7 @@ _WRAP_TRANSFORM.CXX=	${_WRAP_TRANSFORM.CC}
 . if ${_PKGSRC_MKPIE} != "no"
 _WRAP_CMD_SINK.CC=	${WRAPPER_TMPDIR}/cmd-sink-mkpie-gcc
 _WRAP_CMD_SINK.CXX=	${_WRAP_CMD_SINK.CC}
+_WRAP_CMD_SINK.LD=	${WRAPPER_TMPDIR}/cmd-sink-mkpie-ld
 MKPIE_CFLAGS=		${_MKPIE_CFLAGS.gcc}
 .export MKPIE_CFLAGS
 MKPIE_LDFLAGS=		${_MKPIE_LDFLAGS.gcc}
@@ -523,6 +524,7 @@ generate-wrappers: ${_target_}
 	cmd-sink-interix-gcc \
 	cmd-sink-ld \
 	cmd-sink-mkpie-gcc \
+	cmd-sink-mkpie-ld \
 	cmd-sink-osf1-cc \
 	cmd-sink-osf1-ld \
 	cmd-sink-hpux-cc \
diff --git a/mk/wrapper/cmd-sink-mkpie-ld b/mk/wrapper/cmd-sink-mkpie-ld
new file mode 100644
index 00000000000..5d255e85cbb
--- /dev/null
+++ b/mk/wrapper/cmd-sink-mkpie-ld
@@ -0,0 +1,38 @@
+# $NetBSD: cmd-sink-mkpie-ld,v 1.1 2017/11/16 02:16:56 khorben Exp $
+#
+# Copyright (c) 2017 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Pierre Pronchery.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+. ${cmd_sink%-mkpie-ld}
+
+# Append any optional flags required when linking binaries.
+if $test "$dont_link_binary" != "yes"; then
+	for arg in $MKPIE_LDFLAGS; do
+		$debug_log $wrapperlog "    (cmd-sink-mkpie-ld) pop:  $arg"
+		. $buildcmd
+	done
+fi