D19907.id56191.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D19907.id56191.diff
View Options

	Index: Mk/bsd.gecko.mk
	===================================================================
	--- Mk/bsd.gecko.mk
	+++ Mk/bsd.gecko.mk
	@@ -119,11 +119,6 @@
	MOZ_OPTIONS+= --enable-pie
	.endif

	-.if ${MOZILLA_VER:R:R} >= 65
	-# Let vendor add -fstack-protector-strong on all architectures
	-SSP_UNSAFE= yes
	-.endif
	-
	MOZILLA_SUFX?= none
	MOZSRC?= ${WRKSRC}
	PLISTF?= ${WRKDIR}/plist_files
	Index: Mk/bsd.ssp.mk
	===================================================================
	--- Mk/bsd.ssp.mk
	+++ Mk/bsd.ssp.mk
	@@ -4,14 +4,9 @@
	SSP_Include_MAINTAINER= portmgr@FreeBSD.org

	.if !defined(SSP_UNSAFE) && \
	- (${ARCH} == i386 \|\| ${ARCH} == amd64)
	+ (${MACHINE} != "mips")
	# Overridable as a user may want to use -fstack-protector-all
	-SSP_CFLAGS?= -fstack-protector
	+SSP_CFLAGS?= -fstack-protector-strong
	CFLAGS+= ${SSP_CFLAGS}
	-LDFLAGS+= -fstack-protector
	-# -lssp_nonshared is needed on i386 where /usr/lib/libc.so is not an ldscript
	-# This is currently unused XXX
	-. if defined(SSP_NEED_NONSHARED)
	-LDFLAGS+= -lssp_nonshared
	-. endif
	+LDFLAGS+= ${SSP_CFLAGS}
	.endif