From owner-svn-ports-all@FreeBSD.ORG Sat Aug 16 21:18:49 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C28D74A8; Sat, 16 Aug 2014 21:18:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AEA5B2B14; Sat, 16 Aug 2014 21:18:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7GLIn80068322; Sat, 16 Aug 2014 21:18:49 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7GLInHX068321; Sat, 16 Aug 2014 21:18:49 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201408162118.s7GLInHX068321@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 16 Aug 2014 21:18:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365137 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2014 21:18:49 -0000 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