[pkgsrc/trunk]: pkgsrc/mk/compiler mk: Correct the wrappers invocation for RE...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/da36e04a6167
branches:  trunk
changeset: 769005:da36e04a6167
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Nov 06 10:03:32 2021 +0000

description:
mk: Correct the wrappers invocation for RELRO. This should help many
remaining packages that fail to build with RELRO that were uncaught
by my original bulk builds due to CHECK_RELRO failing to work (sorry...)

diffstat:

 mk/compiler/clang.mk |  5 +++--
 mk/compiler/gcc.mk   |  5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 22637645440f -r da36e04a6167 mk/compiler/clang.mk
--- a/mk/compiler/clang.mk      Sat Nov 06 09:49:20 2021 +0000
+++ b/mk/compiler/clang.mk      Sat Nov 06 10:03:32 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: clang.mk,v 1.29 2021/11/02 08:14:58 nia Exp $
+# $NetBSD: clang.mk,v 1.30 2021/11/06 10:03:32 nia Exp $
 #
 # This is the compiler definition for the clang compiler.
 #
@@ -74,7 +74,8 @@
 
 .if ${_PKGSRC_USE_RELRO} == "yes"
 _CLANG_LDFLAGS+=       ${_RELRO_LDFLAGS}
-CWRAPPERS_APPEND.ld+=  ${_RELRO_LDFLAGS}
+CWRAPPERS_APPEND.cc+=  ${_RELRO_LDFLAGS}
+CWRAPPERS_APPEND.cxx+= ${_RELRO_LDFLAGS}
 .endif
 
 LDFLAGS+=      ${_CLANG_LDFLAGS}
diff -r 22637645440f -r da36e04a6167 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Sat Nov 06 09:49:20 2021 +0000
+++ b/mk/compiler/gcc.mk        Sat Nov 06 10:03:32 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.230 2021/11/02 08:14:58 nia Exp $
+# $NetBSD: gcc.mk,v 1.231 2021/11/06 10:03:32 nia Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -650,7 +650,8 @@
 
 .if ${_PKGSRC_USE_RELRO} == "yes"
 _GCC_LDFLAGS+=         ${_RELRO_LDFLAGS}
-CWRAPPERS_APPEND.ld+=  ${_RELRO_LDFLAGS}
+CWRAPPERS_APPEND.cc+=  ${_RELRO_LDFLAGS}
+CWRAPPERS_APPEND.cxx+= ${_RELRO_LDFLAGS}
 .endif
 
 LDFLAGS+=      ${_GCC_LDFLAGS}