From 2ce1d0bd34eeba6c507530224afc69db4ebb924a Mon Sep 17 00:00:00 2001 From: bdrewery Date: Tue, 1 Dec 2015 05:18:59 +0000 Subject: [PATCH] META MODE: Fix rebuilding of lib/clang/include after clang-tblgen.host is staged. None of usr.bin/clang/clang-tblgen or its dependencies need lib/clang/include, so there is no cyclic dependency here to worry about. The issue came about because of workarounds to dependencies on clang being optional. Without this, the clang-tblgen called during the build would change after it was staged for the host. This would cause lib/clang/include to rebuild due to changed build commands. Sponsored by: EMC / Isilon Storage Division --- lib/clang/include/Makefile | 3 --- lib/clang/include/Makefile.depend | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/clang/include/Makefile b/lib/clang/include/Makefile index 1cea2e20f215..bd685915f322 100644 --- a/lib/clang/include/Makefile +++ b/lib/clang/include/Makefile @@ -67,7 +67,4 @@ INCS= __stddef_max_align_t.h \ GENINCS= arm_neon.h CLEANFILES= ${GENINCS} ${GENINCS:C/\.h$/.d/} -# avoid a circular dependency -GENDIRDEPS_FILTER+= Nusr.bin/clang/clang-tblgen.host - .include diff --git a/lib/clang/include/Makefile.depend b/lib/clang/include/Makefile.depend index f80275d86ab1..47d4983b0033 100644 --- a/lib/clang/include/Makefile.depend +++ b/lib/clang/include/Makefile.depend @@ -2,6 +2,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + usr.bin/clang/clang-tblgen.host \ .include