WITH_SSP in src.conf(5) breaks the build

Hi list,

I'd like to have SSP MFC'd for 7.2.  However, there is still a problem:
WITH_SSP breaks the build if set in src.conf(5).  See my previous mail
explaining this below.

On Thu, Sep 04, 2008 at 04:17:05PM +0200, Jeremie Le Hen wrote:
> We indeed already have WITH_SSP/WITHOUT_SSP knob which is turned into
> MK_SSP="yes" or MK_SSP="no" respectively.
> 
> The actual problem lies in Makefiles that define WITHOUT_SSP for some
> reason.  For instance, in Makefile.inc1 the toolchain (namely
> bootstrap-tools, build-tools, cross-tools and a few other things) is
> built without SSP thanks to -DWITHOUT_SSP.  For example:
> 
>  224 BMAKE=          MAKEOBJDIRPREFIX=${WORLDTMP} \
>  225                 ${BMAKEENV} ${MAKE} -f Makefile.inc1 \
>  226                 DESTDIR= \
>  227                 BOOTSTRAPPING=${OSRELDATE} \
>  228                 -DWITHOUT_SSP \
>  229                 -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
>  230                 -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
>  231                 -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
> 
> There is a problem is the user defines WITH_SSP in src.conf or on
> command-line.  In this case, bsd.own.mk screams because both WITH_SSP
> and WITHOUT_SSP are defined.

The attached patch fixes this by using the trick proposed by Ruslan [1]
where possible, or overriding SSP_CFLAGS otherwise.

Once committed, I expect to provide a patch to introduce SSP for
RELENG_7 a few weeks later.

Thank you.
Best regards,

[1] http://lists.freebsd.org/pipermail/freebsd-hackers/2008-September/025891.html
-- 
Jeremie Le Hen
< jeremie at le-hen dot org >< ttz at chchile dot org >