Date: Tue, 16 Jun 2015 23:38:45 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284482 - in head/targets/pseudo: clang toolchain userland/gnu Message-ID: <201506162338.t5GNcjV0077277@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Tue Jun 16 23:38:44 2015 New Revision: 284482 URL: https://svnweb.freebsd.org/changeset/base/284482 Log: Support WITH_LLDB Remove entries from userland/gnu that conflict with toolchain Modified: head/targets/pseudo/clang/Makefile.depend head/targets/pseudo/toolchain/Makefile.depend head/targets/pseudo/userland/gnu/Makefile.depend Modified: head/targets/pseudo/clang/Makefile.depend ============================================================================== --- head/targets/pseudo/clang/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) +++ head/targets/pseudo/clang/Makefile.depend Tue Jun 16 23:38:44 2015 (r284482) @@ -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> Modified: head/targets/pseudo/toolchain/Makefile.depend ============================================================================== --- head/targets/pseudo/toolchain/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) +++ head/targets/pseudo/toolchain/Makefile.depend Tue Jun 16 23:38:44 2015 (r284482) @@ -31,7 +31,7 @@ DIRDEPS+= \ .endif -DIRDEPS= \ +DIRDEPS+= \ usr.bin/xinstall \ gnu/usr.bin/binutils/ar \ gnu/usr.bin/binutils/as \ Modified: head/targets/pseudo/userland/gnu/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/gnu/Makefile.depend Tue Jun 16 23:37:19 2015 (r284481) +++ head/targets/pseudo/userland/gnu/Makefile.depend Tue Jun 16 23:38:44 2015 (r284482) @@ -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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506162338.t5GNcjV0077277>