CVS commit: pkgsrc/mk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jul 20 14:42:11 UTC 2026

Modified Files:
        pkgsrc/mk: compiler.mk

Log Message:
mk: stop passing relro linker flags to compiler

The relro flags are added to LDFLAGS, and that should be sufficient.
Packages not honoring LDFLAGS need to be fixed anyway, and clang
complains about the flags on the compiler command line.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 pkgsrc/mk/compiler.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.mk
diff -u pkgsrc/mk/compiler.mk:1.115 pkgsrc/mk/compiler.mk:1.116
--- pkgsrc/mk/compiler.mk:1.115 Tue Jun 23 13:39:43 2026
+++ pkgsrc/mk/compiler.mk       Mon Jul 20 14:42:11 2026
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.115 2026/06/23 13:39:43 wiz Exp $
+# $NetBSD: compiler.mk,v 1.116 2026/07/20 14:42:11 wiz Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -314,10 +314,6 @@ CWRAPPERS_PREPEND.cxx+=    ${_MKREPRO_CFLAG
 .if (${_PKGSRC_USE_RELRO} == "partial" || ${_PKGSRC_USE_RELRO} == "full") \
      && defined(_RELRO_LDFLAGS)
 LDFLAGS+=              ${_RELRO_LDFLAGS}
-_WRAP_EXTRA_ARGS.CC+=  ${_RELRO_LDFLAGS}
-_WRAP_EXTRA_ARGS.CXX+= ${_RELRO_LDFLAGS}
-CWRAPPERS_PREPEND.cc+= ${_RELRO_LDFLAGS}
-CWRAPPERS_PREPEND.cxx+= ${_RELRO_LDFLAGS}
 .endif
 
 # Enable position-independent executables if the user has chosen to and