svn commit: r265789 - projects/bmake/share/mk

Simon J. Gerraty sjg at FreeBSD.org
Sat May 10 00:25:22 UTC 2014


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
 


More information about the svn-src-projects mailing list