aboutsummaryrefslogtreecommitdiff
path: root/targets
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2015-06-16 23:38:44 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2015-06-16 23:38:44 +0000
commit71e221e8b423bf9dee225d8198e091f468811889 (patch)
treebd9fd1790e27f9bf267be928d0b15bb9680cfac1 /targets
parent2ef6d5a7b9254348e585e80e43049e1f3a2f7c99 (diff)
downloadsrc-71e221e8b423bf9dee225d8198e091f468811889.tar.gz
src-71e221e8b423bf9dee225d8198e091f468811889.zip
Support WITH_LLDB
Remove entries from userland/gnu that conflict with toolchain
Notes
Notes: svn path=/head/; revision=284482
Diffstat (limited to 'targets')
-rw-r--r--targets/pseudo/clang/Makefile.depend8
-rw-r--r--targets/pseudo/toolchain/Makefile.depend2
-rw-r--r--targets/pseudo/userland/gnu/Makefile.depend6
3 files changed, 9 insertions, 7 deletions
diff --git a/targets/pseudo/clang/Makefile.depend b/targets/pseudo/clang/Makefile.depend
index ae940107414f..4dbc0af4fe78 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 92d1c88e842c..e2e020251ded 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 a95692b8b58e..fb5f71169a53 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 \