From cd4bd9496ed6c655784673b20bf4574cc10bce42 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 29 Sep 2013 20:20:17 +0000
Subject: [PATCH] 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           | 2 +-
 sys/boot/powerpc/boot1.chrp/Makefile | 2 +-
 sys/boot/userboot/libstand/Makefile  | 2 +-
 sys/boot/userboot/test/Makefile      | 2 +-
 sys/boot/userboot/userboot/Makefile  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/boot/i386/efi/Makefile b/sys/boot/i386/efi/Makefile
index 25df59b77d7..8e3e776a680 100644
--- a/sys/boot/i386/efi/Makefile
+++ b/sys/boot/i386/efi/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 NO_MAN=
-WITHOUT_SSP=
 BUILDING_EFI=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG=		loader.sym
 INTERNALPROG=
diff --git a/sys/boot/powerpc/boot1.chrp/Makefile b/sys/boot/powerpc/boot1.chrp/Makefile
index 943d146dbb9..10e6368dd12 100644
--- a/sys/boot/powerpc/boot1.chrp/Makefile
+++ b/sys/boot/powerpc/boot1.chrp/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-WITHOUT_SSP=
+SSP_CFLAGS=
 
 PROG=           boot1.elf
 NEWVERSWHAT=    "Open Firmware boot block" ${MACHINE_ARCH}
diff --git a/sys/boot/userboot/libstand/Makefile b/sys/boot/userboot/libstand/Makefile
index 49c6bfbd543..76af4b9b761 100644
--- a/sys/boot/userboot/libstand/Makefile
+++ b/sys/boot/userboot/libstand/Makefile
@@ -6,10 +6,10 @@
 #   quite large.
 #
 
-WITHOUT_SSP=
 NO_MAN=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 S=		${.CURDIR}/../../../../lib/libstand
 
diff --git a/sys/boot/userboot/test/Makefile b/sys/boot/userboot/test/Makefile
index 24d89b7f576..69674613ce0 100644
--- a/sys/boot/userboot/test/Makefile
+++ b/sys/boot/userboot/test/Makefile
@@ -2,9 +2,9 @@
 
 
 NO_MAN=
-WITHOUT_SSP=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG=		test
 INTERNALPROG=
diff --git a/sys/boot/userboot/userboot/Makefile b/sys/boot/userboot/userboot/Makefile
index a4bec5c22e9..1df1f30e5f7 100644
--- a/sys/boot/userboot/userboot/Makefile
+++ b/sys/boot/userboot/userboot/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 NO_MAN=
-WITHOUT_SSP=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 SHLIB_NAME=	userboot.so
 NO_CTF=		yes
-- 
2.45.2