diff options
| author | nia <nia@pkgsrc.org> | 2021-10-04 14:21:21 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-10-04 14:21:21 +0000 |
| commit | 03474206a45e738551b870e91ca99185673b7cb5 (patch) | |
| tree | f894f6c252ab67395efb70319637f7f1bfe0fdb8 /mk/compiler | |
| parent | 46ee2f7b8fe8ed03feb6985f4a8d5c7261a6477d (diff) | |
| download | pkgsrc-03474206a45e738551b870e91ca99185673b7cb5.tar.gz | |
mk: omit space between -z and relro
prevents mangling by wrappers in mysterious circumstances
Diffstat (limited to 'mk/compiler')
| -rw-r--r-- | mk/compiler/clang.mk | 6 | ||||
| -rw-r--r-- | mk/compiler/gcc.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mk/compiler/clang.mk b/mk/compiler/clang.mk index c39d2c14e9f..55fedbadeb0 100644 --- a/mk/compiler/clang.mk +++ b/mk/compiler/clang.mk @@ -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. diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index 7fe4bd8b710..7ddf207dde2 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -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 |