Date: Tue, 12 Mar 2013 17:21:04 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r248211 - projects/bmake/share/mk Message-ID: <201303121721.r2CHL4cT063577@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Tue Mar 12 17:21:03 2013 New Revision: 248211 URL: http://svnweb.freebsd.org/changeset/base/248211 Log: Apply DEP_DIRDEPS_FILTER.${DEP_MACHINE} as needed. Use DEP_DIRDEPS_FILTER.host to supress dependencies for host tools. Modified: projects/bmake/share/mk/local.dirdeps.mk projects/bmake/share/mk/local.sys.mk Modified: projects/bmake/share/mk/local.dirdeps.mk ============================================================================== --- projects/bmake/share/mk/local.dirdeps.mk Tue Mar 12 14:30:36 2013 (r248210) +++ projects/bmake/share/mk/local.dirdeps.mk Tue Mar 12 17:21:03 2013 (r248211) @@ -1,13 +1,3 @@ -.if !target(_DIRDEP_USE) -# first time read -.if ${MACHINE} == "host" -DIRDEPS_FILTER+= \ - Ninclude* \ - Nlib/* \ - Ngnu/lib/* \ - -.endif -.endif # this is how we can handle optional dependencies .if ${MK_SSP:Uno} != "no" && defined(PROG) @@ -18,3 +8,15 @@ DIRDEPS += gnu/lib/libssp/libssp_nonshar .if ${DEP_RELDIR:U${RELDIR}} != "pkgs/pseudo/stage" DIRDEPS += pkgs/pseudo/stage .endif + +# we want to supress these dependencies for host tools +DEP_DIRDEPS_FILTER.host = \ + Ninclude* \ + Nlib/* \ + Ngnu/lib/* \ + + +.if !empty(DIRDEPS) && !empty(DEP_DIRDEPS_FILTER.${DEP_MACHINE}) +DIRDEPS := ${DIRDEPS:${DEP_DIRDEPS_FILTER.${DEP_MACHINE}:ts:}} +.endif + Modified: projects/bmake/share/mk/local.sys.mk ============================================================================== --- projects/bmake/share/mk/local.sys.mk Tue Mar 12 14:30:36 2013 (r248210) +++ projects/bmake/share/mk/local.sys.mk Tue Mar 12 17:21:03 2013 (r248211) @@ -83,6 +83,10 @@ HOST_OBJTOP ?= ${OBJROOT}${HOST_TARGET} .if ${OBJTOP} == ${HOST_OBJTOP} || ${REQUESTED_MACHINE:U${MACHINE}} == "host" MACHINE= host +.if ${TARGET_MACHINE:Uno} == ${HOST_TARGET} +# not what we want +TARGET_MACHINE= host +.endif .endif .if ${MACHINE} == "host" OBJTOP := ${HOST_OBJTOP}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303121721.r2CHL4cT063577>