From owner-svn-src-projects@FreeBSD.ORG  Sat May 10 00:25:21 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E3B2CA68;
 Sat, 10 May 2014 00:25:21 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D17E0A31;
 Sat, 10 May 2014 00:25:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4A0PL4F066547;
 Sat, 10 May 2014 00:25:21 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4A0PLCh066545;
 Sat, 10 May 2014 00:25:21 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201405100025.s4A0PLCh066545@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sat, 10 May 2014 00:25:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r265789 - projects/bmake/share/mk
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.18
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: Sat, 10 May 2014 00:25:22 -0000

Author: sjg
Date: Sat May 10 00:25:21 2014
New Revision: 265789
URL: http://svnweb.freebsd.org/changeset/base/265789

Log:
  We now want src.opts.mk

Modified:
  projects/bmake/share/mk/local.dirdeps.mk

Modified: projects/bmake/share/mk/local.dirdeps.mk
==============================================================================
--- projects/bmake/share/mk/local.dirdeps.mk	Sat May 10 00:24:32 2014	(r265788)
+++ projects/bmake/share/mk/local.dirdeps.mk	Sat May 10 00:25:21 2014	(r265789)
@@ -2,7 +2,7 @@
 # we are the 1st makefile
 
 .if !defined(MK_CTF)
-.include "${SRCTOP}/share/mk/bsd.opts.mk"
+.include "${SRCTOP}/share/mk/src.opts.mk"
 .endif
 
 # DEP_MACHINE is set before we get here, this may not be.
@@ -41,7 +41,7 @@ DIRDEPS_FILTER.host = \
 .if ${DEP_MACHINE} != "host"
 
 # this is how we can handle optional dependencies
-.if ${MK_SSP:Uno} != "no" && defined(PROG)
+.if ${MK_SSP:Uno} != "no" && ${DEP_RELDIR:U${RELDIR}} == "lib/libc"
 DIRDEPS += gnu/lib/libssp/libssp_nonshared
 .endif