CVS commit: pkgsrc/mk/compiler

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Oct  4 14:21:21 UTC 2021

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

Log Message:
mk: omit space between -z and relro

prevents mangling by wrappers in mysterious circumstances


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mk/compiler/clang.mk
cvs rdiff -u -r1.227 -r1.228 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.27 pkgsrc/mk/compiler/clang.mk:1.28
--- pkgsrc/mk/compiler/clang.mk:1.27    Tue Aug  3 07:28:15 2021
+++ pkgsrc/mk/compiler/clang.mk Mon Oct  4 14:21:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: clang.mk,v 1.27 2021/08/03 07:28:15 nia Exp $
+# $NetBSD: clang.mk,v 1.28 2021/10/04 14:21:21 nia Exp $
 #
 # This is the compiler definition for the clang compiler.
 #
@@ -57,9 +57,9 @@ _CTF_CFLAGS=          -gdwarf-2
 
 # The user can choose the level of RELRO.
 .if ${PKGSRC_USE_RELRO} == "partial"
-_RELRO_LDFLAGS=                -Wl,-z,relro
+_RELRO_LDFLAGS=                -Wl,-zrelro
 .else
-_RELRO_LDFLAGS=                -Wl,-z,relro -Wl,-z,now
+_RELRO_LDFLAGS=                -Wl,-zrelro -Wl,-znow
 .endif
 
 # The user can choose the level of stack smashing protection.

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.227 pkgsrc/mk/compiler/gcc.mk:1.228
--- pkgsrc/mk/compiler/gcc.mk:1.227     Fri Oct  1 11:56:12 2021
+++ pkgsrc/mk/compiler/gcc.mk   Mon Oct  4 14:21:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.227 2021/10/01 11:56:12 nia Exp $
+# $NetBSD: gcc.mk,v 1.228 2021/10/04 14:21:21 nia Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -414,9 +414,9 @@ CWRAPPERS_APPEND.cc+=       ${_FORTIFY_CFLAGS}
 
 # The user can choose the level of RELRO.
 .if ${PKGSRC_USE_RELRO} == "partial"
-_RELRO_LDFLAGS=                -Wl,-z,relro
+_RELRO_LDFLAGS=                -Wl,-zrelro
 .else
-_RELRO_LDFLAGS=                -Wl,-z,relro -Wl,-z,now
+_RELRO_LDFLAGS=                -Wl,-zrelro -Wl,-znow
 .endif
 
 _STACK_CHECK_CFLAGS=   -fstack-check