D31400.id93188.diff
No OneTemporary
Actions

Size

932 B

Referenced Files

None

Subscribers

None

D31400.id93188.diff
View Options

	Index: share/mk/bsd.sys.mk
	===================================================================
	--- share/mk/bsd.sys.mk
	+++ share/mk/bsd.sys.mk
	@@ -239,12 +239,11 @@
	# but not yet.
	CXXFLAGS.clang+= -Wno-c++11-extensions

	-.if ${MK_SSP} != "no" && \
	- ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
	+.if ${MK_SSP} != "no"
	# Don't use -Wstack-protector as it breaks world with -Werror.
	SSP_CFLAGS?= -fstack-protector-strong
	CFLAGS+= ${SSP_CFLAGS}
	-.endif # SSP && !ARM && !MIPS
	+.endif # SSP

	# Additional flags passed in CFLAGS and CXXFLAGS when MK_DEBUG_FILES is
	# enabled.
	Index: sys/conf/kern.mk
	===================================================================
	--- sys/conf/kern.mk
	+++ sys/conf/kern.mk
	@@ -213,8 +213,7 @@
	#
	# GCC SSP support
	#
	-.if ${MK_SSP} != "no" && \
	- ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
	+.if ${MK_SSP} != "no"
	CFLAGS+= -fstack-protector
	.endif