CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jul 29 18:09:39 UTC 2023

Modified Files:
        pkgsrc/mk: compiler.mk

Log Message:
mk: Use CWRAPPERS_PREPEND instead of APPEND to force the use of SSP

For the sake of consistency, and to allow packages to override the
choice of the infrastructure if necessary.


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 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.103 pkgsrc/mk/compiler.mk:1.104
--- pkgsrc/mk/compiler.mk:1.103 Sat Jul 29 17:55:47 2023
+++ pkgsrc/mk/compiler.mk       Sat Jul 29 18:09:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.103 2023/07/29 17:55:47 nia Exp $
+# $NetBSD: compiler.mk,v 1.104 2023/07/29 18:09:39 nia Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -244,9 +244,9 @@ CWRAPPERS_PREPEND.f77+=     ${_COMPILER_ABI_
 .if ${_PKGSRC_USE_SSP} == "yes" && defined(_SSP_CFLAGS)
 _WRAP_EXTRA_ARGS.CC+=  ${_SSP_CFLAGS}
 _WRAP_EXTRA_ARGS.CXX+= ${_SSP_CFLAGS}
-CWRAPPERS_APPEND.cc+=  ${_SSP_CFLAGS}
-CWRAPPERS_APPEND.cxx+= ${_SSP_CFLAGS}
-CWRAPPERS_APPEND.f77+= ${_SSP_CFLAGS}
+CWRAPPERS_PREPEND.cc+= ${_SSP_CFLAGS}
+CWRAPPERS_PREPEND.cxx+=        ${_SSP_CFLAGS}
+CWRAPPERS_PREPEND.f77+=        ${_SSP_CFLAGS}
 .endif
 
 # Enable FORTIFY_SOURCE if the user has chosen to and the compiler