From owner-svn-src-head@FreeBSD.ORG Tue Jun 16 23:38:46 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 322B01C0; Tue, 16 Jun 2015 23:38:46 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0667E106; Tue, 16 Jun 2015 23:38:46 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GNcjeL077281; Tue, 16 Jun 2015 23:38:45 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GNcjV0077277; Tue, 16 Jun 2015 23:38:45 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506162338.t5GNcjV0077277@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Tue, 16 Jun 2015 23:38:45 +0000 (UTC) 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 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jun 2015 23:38:46 -0000 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 +.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 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 \