CVS commit: pkgsrc/mk/compiler

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Dec 19 11:55:29 UTC 2021

Modified Files:
        pkgsrc/mk/compiler: clang.mk gcc.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mk/compiler/clang.mk
cvs rdiff -u -r1.232 -r1.233 pkgsrc/mk/compiler/gcc.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/compiler/clang.mk
diff -u pkgsrc/mk/compiler/clang.mk:1.31 pkgsrc/mk/compiler/clang.mk:1.32
--- pkgsrc/mk/compiler/clang.mk:1.31    Sun Nov  7 11:25:33 2021
+++ pkgsrc/mk/compiler/clang.mk Sun Dec 19 11:55:29 2021
@@ -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 @@ _SSP_CFLAGS=          -fstack-protector
 
 .if ${_PKGSRC_USE_RELRO} == "yes"
 _CLANG_LDFLAGS+=       ${_RELRO_LDFLAGS}
+CWRAPPERS_PREPEND.cc+= ${_RELRO_LDFLAGS}
+CWRAPPERS_PREPEND.cxx+=        ${_RELRO_LDFLAGS}
 .endif
 
 LDFLAGS+=      ${_CLANG_LDFLAGS}

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.232 pkgsrc/mk/compiler/gcc.mk:1.233
--- pkgsrc/mk/compiler/gcc.mk:1.232     Sun Nov  7 11:25:33 2021
+++ pkgsrc/mk/compiler/gcc.mk   Sun Dec 19 11:55:29 2021
@@ -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 @@ _GCC_LDFLAGS+=      -L${_dir_} ${COMPILER_RPA
 
 .if ${_PKGSRC_USE_RELRO} == "yes"
 _GCC_LDFLAGS+=         ${_RELRO_LDFLAGS}
+CWRAPPERS_PREPEND.cc+= ${_RELRO_LDFLAGS}
+CWRAPPERS_PREPEND.cxx+=        ${_RELRO_LDFLAGS}
 .endif
 
 LDFLAGS+=      ${_GCC_LDFLAGS}