Support WITH_LLDB

Remove entries from userland/gnu that conflict with toolchain

3 files changed, 9 insertions, 7 deletions

diff --git a/targets/pseudo/clang/Makefile.depend b/targets/pseudo/clang/Makefile.depend
index ae94010..4dbc0af 100644
--- a/targets/pseudo/clang/Makefile.depend
+++ b/targets/pseudo/clang/Makefile.depend
@@ -2,6 +2,10 @@
 
 # This file is not autogenerated - take care!
 
+.if !defined(MK_LLDB)
+.include <src.opts.mk>
+.endif
+
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
@@ -11,5 +15,9 @@ DIRDEPS = \
 	usr.bin/clang/clang-tblgen \
 	usr.bin/clang/tblgen \
 
+.if ${MK_LLDB} == "yes"
+DIRDEPS+= \
+	usr.bin/clang/lldb
+.endif
 
 .include <dirdeps.mk>
diff --git a/targets/pseudo/toolchain/Makefile.depend b/targets/pseudo/toolchain/Makefile.depend
index 92d1c88..e2e0202 100644
--- a/targets/pseudo/toolchain/Makefile.depend
+++ b/targets/pseudo/toolchain/Makefile.depend
@@ -31,7 +31,7 @@ DIRDEPS+= \
 
 .endif
 
-DIRDEPS= \
+DIRDEPS+= \
 	usr.bin/xinstall \
 	gnu/usr.bin/binutils/ar \
 	gnu/usr.bin/binutils/as \
diff --git a/targets/pseudo/userland/gnu/Makefile.depend b/targets/pseudo/userland/gnu/Makefile.depend
index a95692b..fb5f711 100644
--- a/targets/pseudo/userland/gnu/Makefile.depend
+++ b/targets/pseudo/userland/gnu/Makefile.depend
@@ -16,7 +16,6 @@ DIRDEPS = \
 	gnu/lib/libssp/libssp_nonshared \
 	gnu/lib/libstdc++ \
 	gnu/lib/libsupc++ \
-	gnu/usr.bin/binutils/addr2line \
 	gnu/usr.bin/binutils/ar \
 	gnu/usr.bin/binutils/as \
 	gnu/usr.bin/binutils/doc \
@@ -25,14 +24,9 @@ DIRDEPS = \
 	gnu/usr.bin/binutils/libbinutils \
 	gnu/usr.bin/binutils/libiberty \
 	gnu/usr.bin/binutils/libopcodes \
-	gnu/usr.bin/binutils/nm \
 	gnu/usr.bin/binutils/objcopy \
 	gnu/usr.bin/binutils/objdump \
 	gnu/usr.bin/binutils/ranlib \
-	gnu/usr.bin/binutils/readelf \
-	gnu/usr.bin/binutils/size \
-	gnu/usr.bin/binutils/strings \
-	gnu/usr.bin/binutils/strip \
 	gnu/usr.bin/dialog \
 	gnu/usr.bin/diff/doc \
 	gnu/usr.bin/diff3 \