svn commit: r257510 - projects/uefi/sys/boot/amd64/efi

[Ed Maste]

Author: emaste
Date: Fri Nov  1 17:12:45 2013
New Revision: 257510
URL: http://svnweb.freebsd.org/changeset/base/257510

Log:
  Merge r255944 (bdrewery) from HEAD i386:
  
    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
  
  This change in HEAD was made after the efi directory moved to amd64 on
  the projects/efi branch.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/uefi/sys/boot/amd64/efi/Makefile

Modified: projects/uefi/sys/boot/amd64/efi/Makefile
==============================================================================
--- projects/uefi/sys/boot/amd64/efi/Makefile	Fri Nov  1 16:48:30 2013	(r257509)
+++ projects/uefi/sys/boot/amd64/efi/Makefile	Fri Nov  1 17:12:45 2013	(r257510)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 NO_MAN=
-WITHOUT_SSP=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG=		loader.sym
 INTERNALPROG=