[pkgsrc/trunk]: pkgsrc/mk/compiler mk/compiler: Return the cwrappers stuff fo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f0a2ecbed2f9
branches:  trunk
changeset: 771546:f0a2ecbed2f9
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Dec 19 11:55:29 2021 +0000

description:
mk/compiler: Return the cwrappers stuff for RELRO now that it doesn't
cause any noticable breakage.

diffstat:

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

diffs (36 lines):

diff -r d12b3737a06a -r f0a2ecbed2f9 mk/compiler/clang.mk
--- a/mk/compiler/clang.mk      Sun Dec 19 11:37:40 2021 +0000
+++ b/mk/compiler/clang.mk      Sun Dec 19 11:55:29 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: clang.mk,v 1.31 2021/11/07 11:25:33 nia Exp $
+# $NetBSD: clang.mk,v 1.32 2021/12/19 11:55:29 nia Exp $
 #
 # This is the compiler definition for the clang compiler.
 #
@@ -74,6 +74,8 @@
 
 .if ${_PKGSRC_USE_RELRO} == "yes"
 _CLANG_LDFLAGS+=       ${_RELRO_LDFLAGS}
+CWRAPPERS_PREPEND.cc+= ${_RELRO_LDFLAGS}
+CWRAPPERS_PREPEND.cxx+=        ${_RELRO_LDFLAGS}
 .endif
 
 LDFLAGS+=      ${_CLANG_LDFLAGS}
diff -r d12b3737a06a -r f0a2ecbed2f9 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Sun Dec 19 11:37:40 2021 +0000
+++ b/mk/compiler/gcc.mk        Sun Dec 19 11:55:29 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.232 2021/11/07 11:25:33 nia Exp $
+# $NetBSD: gcc.mk,v 1.233 2021/12/19 11:55:29 nia Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -650,6 +650,8 @@
 
 .if ${_PKGSRC_USE_RELRO} == "yes"
 _GCC_LDFLAGS+=         ${_RELRO_LDFLAGS}
+CWRAPPERS_PREPEND.cc+= ${_RELRO_LDFLAGS}
+CWRAPPERS_PREPEND.cxx+=        ${_RELRO_LDFLAGS}
 .endif
 
 LDFLAGS+=      ${_GCC_LDFLAGS}