svn commit: r301993 - in head: lib/clang lib/clang/libclangformat lib/clang/libclangtoolingcore targets/pseudo/clang tools/build/mk usr.bin/clang usr.bin/clang/clang-format
Bryan Drewery
bdrewery at FreeBSD.org
Fri Jun 17 16:47:01 UTC 2016
Author: bdrewery
Date: Fri Jun 17 16:46:58 2016
New Revision: 301993
URL: https://svnweb.freebsd.org/changeset/base/301993
Log:
Add clang-format under WITH_CLANG_EXTRAS.
Reviewed by: dim
Approved by: re (gjb)
Sponsored by: EMC / Isilon Storage Division
Differential Revision: https://reviews.freebsd.org/D6856
Added:
head/lib/clang/libclangformat/
head/lib/clang/libclangformat/Makefile (contents, props changed)
head/lib/clang/libclangformat/Makefile.depend (contents, props changed)
head/lib/clang/libclangtoolingcore/
head/lib/clang/libclangtoolingcore/Makefile (contents, props changed)
head/lib/clang/libclangtoolingcore/Makefile.depend (contents, props changed)
head/usr.bin/clang/clang-format/
head/usr.bin/clang/clang-format/Makefile (contents, props changed)
head/usr.bin/clang/clang-format/Makefile.depend (contents, props changed)
Modified:
head/lib/clang/Makefile
head/targets/pseudo/clang/Makefile.depend
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.bin/clang/Makefile
Modified: head/lib/clang/Makefile
==============================================================================
--- head/lib/clang/Makefile Fri Jun 17 16:44:31 2016 (r301992)
+++ head/lib/clang/Makefile Fri Jun 17 16:46:58 2016 (r301993)
@@ -90,7 +90,9 @@ SUBDIR= libclanganalysis \
libllvmx86utils
.if ${MK_CLANG_EXTRAS} != "no"
-SUBDIR+=libllvmdebuginfodwarf \
+SUBDIR+=libclangformat \
+ libclangtoolingcore \
+ libllvmdebuginfodwarf \
libllvmdebuginfopdb \
libllvmlibdriver \
libllvmlto \
Added: head/lib/clang/libclangformat/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/clang/libclangformat/Makefile Fri Jun 17 16:46:58 2016 (r301993)
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB= clangformat
+
+SRCDIR= tools/clang/lib/Format
+
+SRCS= BreakableToken.cpp \
+ ContinuationIndenter.cpp \
+ Format.cpp \
+ FormatToken.cpp \
+ TokenAnnotator.cpp \
+ UnwrappedLineFormatter.cpp \
+ UnwrappedLineParser.cpp \
+ WhitespaceManager.cpp
+
+TGHDRS= DiagnosticCommonKinds
+
+.include "../clang.lib.mk"
Added: head/lib/clang/libclangformat/Makefile.depend
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/clang/libclangformat/Makefile.depend Fri Jun 17 16:46:58 2016 (r301993)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+ include \
+ include/xlocale \
+ lib/libc++ \
+ lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
Added: head/lib/clang/libclangtoolingcore/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/clang/libclangtoolingcore/Makefile Fri Jun 17 16:46:58 2016 (r301993)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB= clangtoolingcore
+
+SRCDIR= tools/clang/lib/Tooling/Core
+CFLAGS+= -I${LLVM_SRCS}/tools
+SRCS= Lookup.cpp \
+ Replacement.cpp
+
+TGHDRS= AttrList \
+ Attrs \
+ CommentCommandList \
+ DeclNodes \
+ DiagnosticCommonKinds \
+ StmtNodes
+
+.include "../clang.lib.mk"
Added: head/lib/clang/libclangtoolingcore/Makefile.depend
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/clang/libclangtoolingcore/Makefile.depend Fri Jun 17 16:46:58 2016 (r301993)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+ include \
+ include/xlocale \
+ lib/libc++ \
+ lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
Modified: head/targets/pseudo/clang/Makefile.depend
==============================================================================
--- head/targets/pseudo/clang/Makefile.depend Fri Jun 17 16:44:31 2016 (r301992)
+++ head/targets/pseudo/clang/Makefile.depend Fri Jun 17 16:46:58 2016 (r301993)
@@ -21,6 +21,7 @@ DIRDEPS+= \
.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 \
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jun 17 16:44:31 2016 (r301992)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jun 17 16:46:58 2016 (r301993)
@@ -1237,6 +1237,7 @@ OLD_FILES+=usr/share/man/man1/llvm-tblge
.if ${MK_CLANG_EXTRAS} == no
OLD_FILES+=usr/bin/bugpoint
+OLD_FILES+=usr/bin/clang-format
OLD_FILES+=usr/bin/llc
OLD_FILES+=usr/bin/lli
OLD_FILES+=usr/bin/llvm-ar
Modified: head/usr.bin/clang/Makefile
==============================================================================
--- head/usr.bin/clang/Makefile Fri Jun 17 16:44:31 2016 (r301992)
+++ head/usr.bin/clang/Makefile Fri Jun 17 16:46:58 2016 (r301993)
@@ -7,6 +7,7 @@ SUBDIR= clang clang-tblgen llvm-tblgen
.if !defined(TOOLS_PREFIX)
.if ${MK_CLANG_EXTRAS} != "no"
SUBDIR+=bugpoint \
+ clang-format \
llc \
lli \
llvm-ar \
Added: head/usr.bin/clang/clang-format/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/clang/clang-format/Makefile Fri Jun 17 16:46:58 2016 (r301993)
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+MAN=
+.include <bsd.own.mk>
+
+PROG_CXX=clang-format
+
+SRCDIR= tools/clang/tools/clang-format
+SRCS= ClangFormat.cpp
+
+LIBDEPS=clangrewrite \
+ clanglex \
+ clangformat \
+ clangbasic \
+ clangast \
+ clangtoolingcore \
+ llvmmc \
+ llvmcore \
+ llvmsupport \
+
+TGHDRS= DiagnosticCommonKinds
+
+.include "../clang.prog.mk"
Added: head/usr.bin/clang/clang-format/Makefile.depend
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/clang/clang-format/Makefile.depend Fri Jun 17 16:46:58 2016 (r301993)
@@ -0,0 +1,32 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
+ include \
+ include/xlocale \
+ lib/${CSU_DIR} \
+ lib/clang/libclangast \
+ lib/clang/libclangbasic \
+ lib/clang/libclangformat \
+ lib/clang/libclanglex \
+ lib/clang/libclangrewrite \
+ lib/clang/libclangtoolingcore \
+ lib/clang/libllvmcore \
+ lib/clang/libllvmmc \
+ lib/clang/libllvmsupport \
+ lib/libc \
+ lib/libc++ \
+ lib/libcompiler_rt \
+ lib/libthr \
+ lib/msun \
+ lib/ncurses/ncursesw \
+ usr.bin/clang/clang-tblgen.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
More information about the svn-src-all
mailing list