Date: Sat, 16 Aug 2014 21:18:49 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365137 - head/Mk Message-ID: <201408162118.s7GLInHX068321@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sat Aug 16 21:18:49 2014 New Revision: 365137 URL: http://svnweb.freebsd.org/changeset/ports/365137 QAT: https://qat.redports.org/buildarchive/r365137/ Log: No need to expand CFLAGS/LDFLAGS here. With hat: portmgr Modified: head/Mk/bsd.ssp.mk Modified: head/Mk/bsd.ssp.mk ============================================================================== --- head/Mk/bsd.ssp.mk Sat Aug 16 21:15:20 2014 (r365136) +++ head/Mk/bsd.ssp.mk Sat Aug 16 21:18:49 2014 (r365137) @@ -20,11 +20,11 @@ SSP_NEED_NONSHARED= yes (${ARCH} == i386 || ${ARCH} == amd64) # Overridable as a user may want to use -fstack-protector-all SSP_CFLAGS?= -fstack-protector -CFLAGS:= ${CFLAGS} ${SSP_CFLAGS} -LDFLAGS:= ${LDFLAGS} -fstack-protector +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:= ${LDFLAGS} -lssp_nonshared +LDFLAGS+= -lssp_nonshared . endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408162118.s7GLInHX068321>