]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Use MK_SSP=no after including bsd.own.mk to disable SSP instead of user-knob
authorBryan Drewery <bdrewery@FreeBSD.org>
Sun, 29 Sep 2013 20:20:17 +0000 (20:20 +0000)
committerBryan Drewery <bdrewery@FreeBSD.org>
Sun, 29 Sep 2013 20:20:17 +0000 (20:20 +0000)
commitcd4bd9496ed6c655784673b20bf4574cc10bce42
tree445cb5852562b9147a8a4dbf1bc7fc71d2125a4d
parent59b5b8941bac5476b6372359c8a1a42babf7fda3
Use MK_SSP=no after including bsd.own.mk to disable SSP instead of user-knob
WITH[OUT]_SSP to avoid hitting an error if user has WITH_SSP in their
make.conf. Ports now use this knob.

  make[7]: "/usr/src/share/mk/bsd.own.mk" line 466: WITH_SSP and
  WITHOUT_SSP can't both be set.

This is similar to previous cleanup done in r188895

Approved by: bapt
Reviewed by: jlh (earlier version)
Approved by: re (marius)
MFC after: 1 week
sys/boot/i386/efi/Makefile
sys/boot/powerpc/boot1.chrp/Makefile
sys/boot/userboot/libstand/Makefile
sys/boot/userboot/test/Makefile
sys/boot/userboot/userboot/Makefile