CVS commit: pkgsrc/mk

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Sun Jul 30 15:09:25 UTC 2023

Modified Files:
        pkgsrc/mk: compiler.mk

Log Message:
mk: Fix relro enablement.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 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.104 pkgsrc/mk/compiler.mk:1.105
--- pkgsrc/mk/compiler.mk:1.104 Sat Jul 29 18:09:39 2023
+++ pkgsrc/mk/compiler.mk       Sun Jul 30 15:09:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.104 2023/07/29 18:09:39 nia Exp $
+# $NetBSD: compiler.mk,v 1.105 2023/07/30 15:09:25 jperkin Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -272,7 +272,7 @@ CWRAPPERS_PREPEND.cxx+=     ${_MKREPRO_CFLAG
 # Enable relocation read-only if the user has chosen to and the compiler
 # supports it.
 #
-.if defined(_RELRO_LDFLAGS)
+.if ${_PKGSRC_USE_RELRO} == "yes" && defined(_RELRO_LDFLAGS)
 LDFLAGS+=              ${_RELRO_LDFLAGS}
 _WRAP_EXTRA_ARGS.CC+=  ${_RELRO_LDFLAGS}
 _WRAP_EXTRA_ARGS.CXX+= ${_RELRO_LDFLAGS}