diff options
| author | ngie <ngie@FreeBSD.org> | 2015-10-18 04:07:40 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-10-18 04:07:40 +0000 |
| commit | 49d57a74871534cd60670d00ac5817201bee6af1 (patch) | |
| tree | 6986c8fecb5e315568d6781100966a7c4aa7206b /share/mk | |
| parent | 2b1070cca99fcd6b56125e04c9b0076599fc2b39 (diff) | |
| download | FreeBSD-src-49d57a74871534cd60670d00ac5817201bee6af1.zip FreeBSD-src-49d57a74871534cd60670d00ac5817201bee6af1.tar.gz | |
Only enable -fstack-protector-strong on gcc 4.9+ and default to -fstack-protector
when -fstack-protector-strong is not available, like it was implicitly before
r288669
As noted by antoine@, devel/gcc (which is 4.8.5) lacks -fstack-protector-strong
support, whereas 4.8.4i (devel/gcc48) has the support.
Until a version is available which has -fstack-protector-strong support, be
conservative and only enable support with 4.9+.
Reviewed by: pfg
X-MFC with: r288669, r289465
Differential Revision: https://reviews.freebsd.org/D3924
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.sys.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 68351a0..cad2b2f 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -150,11 +150,13 @@ CXXFLAGS.clang+= -Wno-c++11-extensions ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" .if (${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30500) || \ (${COMPILER_TYPE} == "gcc" && \ - (${COMPILER_VERSION} == 40201 || ${COMPILER_VERSION} >= 40800)) + (${COMPILER_VERSION} == 40201 || ${COMPILER_VERSION} >= 40900)) # Don't use -Wstack-protector as it breaks world with -Werror. SSP_CFLAGS?= -fstack-protector-strong -CFLAGS+= ${SSP_CFLAGS} +.else +SSP_CFLAGS?= -fstack-protector .endif +CFLAGS+= ${SSP_CFLAGS} .endif # SSP && !ARM && !MIPS # Allow user-specified additional warning flags, plus compiler specific flag overrides. |
