CVS commit: pkgsrc/mk/compiler

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Nov  6 10:03:32 UTC 2021

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

Log Message:
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...)


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mk/compiler/clang.mk
cvs rdiff -u -r1.230 -r1.231 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.29 pkgsrc/mk/compiler/clang.mk:1.30
--- pkgsrc/mk/compiler/clang.mk:1.29    Tue Nov  2 08:14:58 2021
+++ pkgsrc/mk/compiler/clang.mk Sat Nov  6 10:03:32 2021
@@ -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 @@ _SSP_CFLAGS=          -fstack-protector
 
 .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}

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.230 pkgsrc/mk/compiler/gcc.mk:1.231
--- pkgsrc/mk/compiler/gcc.mk:1.230     Tue Nov  2 08:14:58 2021
+++ pkgsrc/mk/compiler/gcc.mk   Sat Nov  6 10:03:32 2021
@@ -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 @@ _GCC_LDFLAGS+=      -L${_dir_} ${COMPILER_RPA
 
 .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}