Date: Mon, 5 May 2008 23:10:51 +0200 From: Jeremie Le Hen <jeremie@le-hen.org> To: obrien@freebsd.org Cc: freebsd-arch@FreeBSD.org Subject: Re: Integration of ProPolice in FreeBSD Message-ID: <20080505211051.GC32317@obiwan.tataz.chchile.org> In-Reply-To: <20080504040110.GC94985@dragon.NUXI.org> References: <20080427012416.GA9817@dragon.NUXI.org> <20080502070147.GE74500@obiwan.tataz.chchile.org> <20080504040110.GC94985@dragon.NUXI.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, May 03, 2008 at 09:01:10PM -0700, David O'Brien wrote: > On Fri, May 02, 2008 at 09:01:47AM +0200, Jeremie Le Hen wrote: > > Index: sys/conf/kern.pre.mk > > =================================================================== > > RCS file: /mnt/octobre/space/freebsd-cvs/src/sys/conf/kern.pre.mk,v > > retrieving revision 1.97 > > diff -u -p -r1.97 kern.pre.mk > > --- sys/conf/kern.pre.mk 2 Feb 2008 19:55:28 -0000 1.97 > > +++ sys/conf/kern.pre.mk 29 Mar 2008 14:06:45 -0000 > > @@ -3,10 +3,7 @@ > > # Part of a unified Makefile for building kernels. This part contains all > > # of the definitions that need to be before %BEFORE_DEPEND. > > > > -SRCCONF?= /etc/src.conf > > -.if exists(${SRCCONF}) > > -.include "${SRCCONF}" > > -.endif > > +.include <bsd.own.mk> > > I may not be seeing it - why do you need this change? It is needed so I can use MK_SSP later in kern.mk: =================================================================== RCS file: /mnt/octobre/space/freebsd-cvs/src/sys/conf/kern.mk,v retrieving revision 1.52 diff -u -p -r1.52 kern.mk --- sys/conf/kern.mk 24 May 2007 21:53:42 -0000 1.52 +++ sys/conf/kern.mk 29 Mar 2008 13:44:15 -0000 @@ -97,3 +97,10 @@ CFLAGS+= -ffreestanding .if ${CC} == "icc" CFLAGS+= -restrict .endif + +# +# GCC SSP support. +# +.if ${MK_SSP} != "no" && ${CC} != "icc" +CFLAGS+= -fstack-protector +.endif Regards, -- Jeremie Le Hen < jeremie at le-hen dot org >< ttz at chchile dot org >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080505211051.GC32317>