diff options
| author | sjg <sjg@FreeBSD.org> | 2013-03-12 17:21:03 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-03-12 17:21:03 +0000 |
| commit | b44c493437faaf8533374a3d1cae0f82672758ae (patch) | |
| tree | ba9af388e0b1b88b8f62620cc498179a098a0cf8 /share | |
| parent | 6d37b86f2b6abb5c0c11a9162e37ddc0ad94f01d (diff) | |
| download | FreeBSD-src-b44c493437faaf8533374a3d1cae0f82672758ae.zip FreeBSD-src-b44c493437faaf8533374a3d1cae0f82672758ae.tar.gz | |
Apply DEP_DIRDEPS_FILTER.${DEP_MACHINE} as needed.
Use DEP_DIRDEPS_FILTER.host to supress dependencies for host tools.
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/local.dirdeps.mk | 22 | ||||
| -rw-r--r-- | share/mk/local.sys.mk | 4 |
2 files changed, 16 insertions, 10 deletions
diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk index 7feb63b..dc7fd33 100644 --- a/share/mk/local.dirdeps.mk +++ b/share/mk/local.dirdeps.mk @@ -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_nonshared .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 + diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index af6e72c..b4be48f 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -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} |
