From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 23:42:55 2013 Return-Path: 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 C968634D; Sat, 12 Oct 2013 23:42:55 +0000 (UTC) (envelope-from sjg@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 9B73C26BA; Sat, 12 Oct 2013 23:42:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNgtMo043859; Sat, 12 Oct 2013 23:42:55 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNgtQx043858; Sat, 12 Oct 2013 23:42:55 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310122342.r9CNgtQx043858@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 12 Oct 2013 23:42:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256406 - 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 23:42:55 -0000 Author: sjg Date: Sat Oct 12 23:42:55 2013 New Revision: 256406 URL: http://svnweb.freebsd.org/changeset/base/256406 Log: Some re-org and cleanup. Make it easier to subst some dirs in dirdeps with variables. Tweak M_dep_qual_fixes esp. for pseudo machines like "host" so that it can DTRT against _machines (in dirdeps.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 Oct 12 23:40:17 2013 (r256405) +++ projects/bmake/share/mk/local.dirdeps.mk Sat Oct 12 23:42:55 2013 (r256406) @@ -1,3 +1,35 @@ +.if !target(_DIRDEP_USE) +# we are the 1st makefile + +# DEP_MACHINE is set before we get here, this may not be. +DEP_RELDIR ?= ${RELDIR} + +.if ${.TARGETS:Uall:M*/*} && empty(DIRDEPS) +# This little trick let's us do +# +# mk -f dirdeps.mk some/dir.i386,bsd +# +DIRDEPS := ${.TARGETS:M*/*} +${.TARGETS:Nall}: all +.endif + +# pseudo machines get no qualification +.for m in host common +M_dep_qual_fixes += C;($m),[^/.,]*$$;\1; +.endfor + +#.info M_dep_qual_fixes=${M_dep_qual_fixes} +# we want to supress these dependencies for host tools +DIRDEPS_FILTER.host = \ + Ninclude* \ + Nlib/lib* \ + Nlib/csu* \ + Nlib/[mn]* \ + Ngnu/lib/csu* \ + Ngnu/lib/lib[a-r]* \ + + +.endif .if ${DEP_MACHINE} != "host" @@ -6,6 +38,13 @@ DIRDEPS += gnu/lib/libssp/libssp_nonshared .endif +# some optional things +.if !defined(WITHOUT_CTF) && ${DEP_RELDIR:U${RELDIR}:Mcddl/usr.bin/ctf*} == "" +DIRDEPS += \ + cddl/usr.bin/ctfconvert.host \ + cddl/usr.bin/ctfmerge.host +.endif + .endif # we need pkgs/pseudo/stage to prep the stage tree @@ -13,19 +52,9 @@ DIRDEPS += gnu/lib/libssp/libssp_nonshar DIRDEPS += pkgs/pseudo/stage .endif -M_dep_qual_fixes += C;\.host,[^/.,]*$$;.host; -M_dep_qual_fixes += C;\.common,[^/.,]*$$;.common; - CSU_DIR.i386 = csu/i386-elf +DEP_MACHINE_ARCH = ${MACHINE_ARCH.${DEP_MACHINE}} CSU_DIR.${DEP_MACHINE_ARCH} ?= csu/${DEP_MACHINE_ARCH} CSU_DIR := ${CSU_DIR.${DEP_MACHINE_ARCH}} - -# we want to supress these dependencies for host tools -DIRDEPS_FILTER.host = \ - Ninclude* \ - Nlib/lib* \ - Nlib/csu* \ - Nlib/[mn]* \ - Ngnu/lib/csu* \ - Ngnu/lib/lib[a-r]* \ - +BOOT_MACHINE_DIR:= ${BOOT_MACHINE_DIR.${DEP_MACHINE}} +KERNEL_NAME:= ${KERNEL_NAME.${DEP_MACHINE}}