diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2019-04-24 19:15:05 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2019-04-24 19:15:05 +0000 |
| commit | 32daaae72c4bea6711020b6b7a68acbaf0af386e (patch) | |
| tree | b590ae091a9af999c14febe1822125712dc4d64d /Mk | |
| parent | a5d01b17a3d027e7980bd9a736a47dee432f579f (diff) | |
| download | ports-32daaae72c4bea6711020b6b7a68acbaf0af386e.tar.gz ports-32daaae72c4bea6711020b6b7a68acbaf0af386e.zip | |
Switch to -fstack-protector-strong and enable on more architectures
PR: 237273
Exp-run by: antoine
Approved by: portmgr (antoine)
Differential Revision: https://reviews.freebsd.org/D19907
Notes
Notes:
svn path=/head/; revision=499897
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gecko.mk | 5 | ||||
| -rw-r--r-- | Mk/bsd.ssp.mk | 11 |
2 files changed, 3 insertions, 13 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 6bec2b87fdb2..384847dd360a 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -119,11 +119,6 @@ BUILD_DEPENDS+= rust-cbindgen>=0.6.8:devel/rust-cbindgen \ 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 diff --git a/Mk/bsd.ssp.mk b/Mk/bsd.ssp.mk index 4f0058fe38da..0bc5819bcd6f 100644 --- a/Mk/bsd.ssp.mk +++ b/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 |