Index: head/targets/pseudo/clang/Makefile.depend
===================================================================
--- head/targets/pseudo/clang/Makefile.depend	(revision 325183)
+++ head/targets/pseudo/clang/Makefile.depend	(revision 325184)
@@ -1,55 +1,77 @@
 # $FreeBSD$
 
 # This file is not autogenerated - take care!
 
 .include <src.opts.mk>
 
 DIRDEPS = \
 	lib/clang/headers \
 	share/doc/llvm/clang \
 	usr.bin/clang/clang \
 	usr.bin/clang/clang-tblgen \
 	usr.bin/clang/llvm-objdump \
 	usr.bin/clang/llvm-tblgen \
 
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+DIRDEPS+= \
+	lib/libclang_rt/include \
+	lib/libclang_rt/asan \
+	lib/libclang_rt/asan-preinit \
+	lib/libclang_rt/asan_dynamic \
+	lib/libclang_rt/asan_cxx \
+	lib/libclang_rt/safestack \
+	lib/libclang_rt/stats \
+	lib/libclang_rt/stats_client \
+	lib/libclang_rt/ubsan_standalone \
+	lib/libclang_rt/ubsan_standalone_cxx \
+
+.endif
+
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \
+    (${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb")
+DIRDEPS+= \
+	lib/libclang_rt/profile \
+
+.endif
+
 .if ${MK_LLDB} == "yes"
 DIRDEPS+= \
 	usr.bin/clang/lldb
 .endif
 
 .if ${MK_CLANG_EXTRAS} == "yes"
 DIRDEPS+= \
 	usr.bin/clang/bugpoint \
 	usr.bin/clang/clang-format \
 	usr.bin/clang/llc \
 	usr.bin/clang/lli \
 	usr.bin/clang/llvm-ar \
 	usr.bin/clang/llvm-as \
 	usr.bin/clang/llvm-bcanalyzer \
 	usr.bin/clang/llvm-cov \
 	usr.bin/clang/llvm-cxxdump \
 	usr.bin/clang/llvm-cxxfilt \
 	usr.bin/clang/llvm-diff \
 	usr.bin/clang/llvm-dis \
 	usr.bin/clang/llvm-dwarfdump \
 	usr.bin/clang/llvm-extract \
 	usr.bin/clang/llvm-link \
 	usr.bin/clang/llvm-lto \
 	usr.bin/clang/llvm-lto2 \
 	usr.bin/clang/llvm-mc \
 	usr.bin/clang/llvm-modextract \
 	usr.bin/clang/llvm-nm \
 	usr.bin/clang/llvm-pdbdump \
 	usr.bin/clang/llvm-profdata \
 	usr.bin/clang/llvm-rtdyld \
 	usr.bin/clang/llvm-symbolizer \
 	usr.bin/clang/llvm-xray \
 	usr.bin/clang/opt \
 
 .endif
 
 .if ${MK_LLD} == "yes"
 DIRDEPS+=	usr.bin/clang/lld
 .endif
 
 .include <dirdeps.mk>