D3924.id9478.diff
No OneTemporary
Actions

Size

799 B

Referenced Files

None

Subscribers

None

D3924.id9478.diff
View Options

	Index: share/mk/bsd.sys.mk
	===================================================================
	--- share/mk/bsd.sys.mk
	+++ share/mk/bsd.sys.mk
	@@ -150,11 +150,13 @@
	${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.