diff options
| author | nia <nia@pkgsrc.org> | 2021-12-19 11:55:29 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-12-19 11:55:29 +0000 |
| commit | ed22c66d1d6e3c553b981f1a35c1758401c6ab1c (patch) | |
| tree | 6c2c784ce707f36563251fc729e19a161c17d8a1 /mk | |
| parent | bac4e9998d092868cb311ad9db013d4f143fb8a3 (diff) | |
| download | pkgsrc-ed22c66d1d6e3c553b981f1a35c1758401c6ab1c.tar.gz | |
mk/compiler: Return the cwrappers stuff for RELRO now that it doesn't
cause any noticable breakage.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/compiler/clang.mk | 4 | ||||
| -rw-r--r-- | mk/compiler/gcc.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mk/compiler/clang.mk b/mk/compiler/clang.mk index 0d58bb16f7f..d2c8be52509 100644 --- a/mk/compiler/clang.mk +++ b/mk/compiler/clang.mk @@ -1,4 +1,4 @@ -# $NetBSD: clang.mk,v 1.31 2021/11/07 11:25:33 nia Exp $ +# $NetBSD: clang.mk,v 1.32 2021/12/19 11:55:29 nia Exp $ # # This is the compiler definition for the clang compiler. # @@ -74,6 +74,8 @@ _SSP_CFLAGS= -fstack-protector .if ${_PKGSRC_USE_RELRO} == "yes" _CLANG_LDFLAGS+= ${_RELRO_LDFLAGS} +CWRAPPERS_PREPEND.cc+= ${_RELRO_LDFLAGS} +CWRAPPERS_PREPEND.cxx+= ${_RELRO_LDFLAGS} .endif LDFLAGS+= ${_CLANG_LDFLAGS} diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index ecfffa25957..867d3c3e771 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.232 2021/11/07 11:25:33 nia Exp $ +# $NetBSD: gcc.mk,v 1.233 2021/12/19 11:55:29 nia Exp $ # # This is the compiler definition for the GNU Compiler Collection. # @@ -650,6 +650,8 @@ _GCC_LDFLAGS+= -L${_dir_} ${COMPILER_RPATH_FLAG}${_dir_} .if ${_PKGSRC_USE_RELRO} == "yes" _GCC_LDFLAGS+= ${_RELRO_LDFLAGS} +CWRAPPERS_PREPEND.cc+= ${_RELRO_LDFLAGS} +CWRAPPERS_PREPEND.cxx+= ${_RELRO_LDFLAGS} .endif LDFLAGS+= ${_GCC_LDFLAGS} |