pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/compiler mk: omit space between -z and relro
details: https://anonhg.NetBSD.org/pkgsrc/rev/24af8fcf0370
branches: trunk
changeset: 459350:24af8fcf0370
user: nia <nia%pkgsrc.org@localhost>
date: Mon Oct 04 14:21:21 2021 +0000
description:
mk: omit space between -z and relro
prevents mangling by wrappers in mysterious circumstances
diffstat:
mk/compiler/clang.mk | 6 +++---
mk/compiler/gcc.mk | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diffs (42 lines):
diff -r f14dabfff281 -r 24af8fcf0370 mk/compiler/clang.mk
--- a/mk/compiler/clang.mk Mon Oct 04 12:05:58 2021 +0000
+++ b/mk/compiler/clang.mk Mon Oct 04 14:21:21 2021 +0000
@@ -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 @@
# 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.
diff -r f14dabfff281 -r 24af8fcf0370 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk Mon Oct 04 12:05:58 2021 +0000
+++ b/mk/compiler/gcc.mk Mon Oct 04 14:21:21 2021 +0000
@@ -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 @@
# 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
Home |
Main Index |
Thread Index |
Old Index