From owner-svn-src-projects@FreeBSD.ORG  Fri Nov  1 17:12:46 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id F326132A;
 Fri,  1 Nov 2013 17:12:45 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E0CA42B19;
 Fri,  1 Nov 2013 17:12:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1HCjgn074134;
 Fri, 1 Nov 2013 17:12:45 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1HCj60074133;
 Fri, 1 Nov 2013 17:12:45 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201311011712.rA1HCj60074133@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 1 Nov 2013 17:12:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r257510 - projects/uefi/sys/boot/amd64/efi
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Nov 2013 17:12:46 -0000

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=