From 3c42abd89d37b7abab115781b728417ce9329cf8 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Tue, 1 Dec 2015 05:18:55 +0000 Subject: [PATCH] META MODE: Don't trim out lib/clang/include dependency. Doing this causes more trouble than it is worth regarding cyclic dependencies. It should not be needed after cleaning up MACHINE=host builds in r291324. Sponsored by: EMC / Isilon Storage Division --- share/mk/local.dirdeps.mk | 4 ---- share/mk/local.gendirdeps.mk | 1 - 2 files changed, 5 deletions(-) diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk index 762fae402d98..6c684cc63692 100644 --- a/share/mk/local.dirdeps.mk +++ b/share/mk/local.dirdeps.mk @@ -86,10 +86,6 @@ DIRDEPS += \ .endif -.if ${MK_CLANG} == "yes" && ${DEP_RELDIR:Nlib/clang/lib*:Nlib/libc*} == "" -DIRDEPS+= lib/clang/include -.endif - .if ${MK_STAGING} == "yes" # we need targets/pseudo/stage to prep the stage tree .if ${DEP_RELDIR} != "targets/pseudo/stage" diff --git a/share/mk/local.gendirdeps.mk b/share/mk/local.gendirdeps.mk index dc65d169d51e..ac22471611ed 100644 --- a/share/mk/local.gendirdeps.mk +++ b/share/mk/local.gendirdeps.mk @@ -9,7 +9,6 @@ GENDIRDEPS_FILTER+= \ Nbin/cat.host \ Ngnu/lib/libssp/libssp_nonshared \ Ncddl/usr.bin/ctf* \ - Nlib/clang/include \ Nlib/libc_nonshared \ Ntargets/pseudo/stage* \ Ntools/*