summaryrefslogtreecommitdiffstats
path: root/clang/tools
diff options
context:
space:
mode:
Diffstat (limited to 'clang/tools')
-rw-r--r--clang/tools/CMakeLists.txt7
-rw-r--r--clang/tools/Makefile6
-rw-r--r--clang/tools/arcmt-test/Makefile2
-rw-r--r--clang/tools/c-arcmt-test/Makefile2
-rw-r--r--clang/tools/c-index-test/Makefile2
-rw-r--r--clang/tools/clang-check/Makefile2
-rw-r--r--clang/tools/clang-format/CMakeLists.txt2
-rw-r--r--clang/tools/clang-format/Makefile2
-rw-r--r--clang/tools/driver/Makefile7
-rw-r--r--clang/tools/libclang/Makefile2
10 files changed, 13 insertions, 21 deletions
diff --git a/clang/tools/CMakeLists.txt b/clang/tools/CMakeLists.txt
index d3f67a89602..90b2225a1d2 100644
--- a/clang/tools/CMakeLists.txt
+++ b/clang/tools/CMakeLists.txt
@@ -1,9 +1,7 @@
add_subdirectory(diagtool)
add_subdirectory(driver)
-if(CLANG_ENABLE_REWRITER)
- add_subdirectory(clang-format)
- add_subdirectory(clang-format-vs)
-endif()
+add_subdirectory(clang-format)
+add_subdirectory(clang-format-vs)
add_subdirectory(c-index-test)
add_subdirectory(libclang)
@@ -12,6 +10,7 @@ if(CLANG_ENABLE_ARCMT)
add_subdirectory(arcmt-test)
add_subdirectory(c-arcmt-test)
endif()
+
if(CLANG_ENABLE_STATIC_ANALYZER)
add_subdirectory(clang-check)
endif()
diff --git a/clang/tools/Makefile b/clang/tools/Makefile
index 94032d20b03..2ee12992f23 100644
--- a/clang/tools/Makefile
+++ b/clang/tools/Makefile
@@ -12,11 +12,7 @@ CLANG_LEVEL := ..
include $(CLANG_LEVEL)/../../Makefile.config
DIRS :=
-PARALLEL_DIRS := driver diagtool
-
-ifeq ($(ENABLE_CLANG_REWRITER),1)
- PARALLEL_DIRS += clang-format
-endif
+PARALLEL_DIRS := clang-format driver diagtool
ifeq ($(ENABLE_CLANG_STATIC_ANALYZER), 1)
PARALLEL_DIRS += clang-check
diff --git a/clang/tools/arcmt-test/Makefile b/clang/tools/arcmt-test/Makefile
index 4b9b8db0a0b..d9d44bb05bd 100644
--- a/clang/tools/arcmt-test/Makefile
+++ b/clang/tools/arcmt-test/Makefile
@@ -18,7 +18,7 @@ NO_INSTALL = 1
include $(CLANG_LEVEL)/../../Makefile.config
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
-USEDLIBS = clangARCMigrate.a clangRewriteCore.a \
+USEDLIBS = clangARCMigrate.a clangRewrite.a \
clangFrontend.a clangDriver.a clangSerialization.a clangParse.a \
clangSema.a clangEdit.a clangAnalysis.a clangAST.a clangLex.a \
clangBasic.a
diff --git a/clang/tools/c-arcmt-test/Makefile b/clang/tools/c-arcmt-test/Makefile
index 0be3bc136eb..e7d5be7658b 100644
--- a/clang/tools/c-arcmt-test/Makefile
+++ b/clang/tools/c-arcmt-test/Makefile
@@ -31,7 +31,7 @@ USEDLIBS = clang.a \
clangFormat.a \
clangTooling.a \
clangRewriteFrontend.a \
- clangRewriteCore.a \
+ clangRewrite.a \
clangFrontend.a clangDriver.a \
clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a \
clangSerialization.a clangParse.a clangSema.a \
diff --git a/clang/tools/c-index-test/Makefile b/clang/tools/c-index-test/Makefile
index b38d654a3ac..42bfbb05839 100644
--- a/clang/tools/c-index-test/Makefile
+++ b/clang/tools/c-index-test/Makefile
@@ -27,7 +27,7 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
# Note that 'USEDLIBS' must include all of the core clang libraries
# when -static is given to linker on cygming.
USEDLIBS = clang.a \
- clangIndex.a clangFormat.a clangRewriteCore.a \
+ clangIndex.a clangFormat.a clangRewrite.a \
clangFrontend.a clangDriver.a \
clangTooling.a \
clangSerialization.a clangParse.a clangSema.a \
diff --git a/clang/tools/clang-check/Makefile b/clang/tools/clang-check/Makefile
index cf088d26893..e98a131de5a 100644
--- a/clang/tools/clang-check/Makefile
+++ b/clang/tools/clang-check/Makefile
@@ -20,6 +20,6 @@ USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \
clangTooling.a clangParse.a clangSema.a \
clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
clangStaticAnalyzerCore.a clangAnalysis.a clangRewriteFrontend.a \
- clangRewriteCore.a clangEdit.a clangAST.a clangLex.a clangBasic.a
+ clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a
include $(CLANG_LEVEL)/Makefile
diff --git a/clang/tools/clang-format/CMakeLists.txt b/clang/tools/clang-format/CMakeLists.txt
index b029f712190..f80a3ec9c91 100644
--- a/clang/tools/clang-format/CMakeLists.txt
+++ b/clang/tools/clang-format/CMakeLists.txt
@@ -8,7 +8,7 @@ target_link_libraries(clang-format
clangBasic
clangFormat
clangLex
- clangRewriteCore
+ clangRewrite
clangTooling
)
diff --git a/clang/tools/clang-format/Makefile b/clang/tools/clang-format/Makefile
index 4902244f865..a26ef59822b 100644
--- a/clang/tools/clang-format/Makefile
+++ b/clang/tools/clang-format/Makefile
@@ -18,7 +18,7 @@ include $(CLANG_LEVEL)/../../Makefile.config
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
USEDLIBS = clangFormat.a clangTooling.a clangFrontend.a clangSerialization.a \
clangDriver.a clangParse.a clangSema.a clangAnalysis.a \
- clangRewriteFrontend.a clangRewriteCore.a clangEdit.a clangAST.a \
+ clangRewriteFrontend.a clangRewrite.a clangEdit.a clangAST.a \
clangLex.a clangBasic.a
include $(CLANG_LEVEL)/Makefile
diff --git a/clang/tools/driver/Makefile b/clang/tools/driver/Makefile
index 7404496875f..347702eb961 100644
--- a/clang/tools/driver/Makefile
+++ b/clang/tools/driver/Makefile
@@ -35,7 +35,8 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
instrumentation ipo irreader linker objcarcopts option \
profiledata selectiondag
USEDLIBS = clangFrontendTool.a clangFrontend.a clangDriver.a \
- clangSerialization.a clangCodeGen.a clangParse.a clangSema.a
+ clangSerialization.a clangCodeGen.a clangParse.a clangSema.a \
+ clangRewriteFrontend.a clangRewrite.a
ifeq ($(ENABLE_CLANG_STATIC_ANALYZER),1)
USEDLIBS += clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
@@ -46,10 +47,6 @@ ifeq ($(ENABLE_CLANG_ARCMT),1)
USEDLIBS += clangARCMigrate.a
endif
-ifeq ($(ENABLE_CLANG_REWRITER),1)
-USEDLIBS += clangRewriteFrontend.a clangRewriteCore.a
-endif
-
USEDLIBS += clangAnalysis.a clangEdit.a clangAST.a clangLex.a clangBasic.a
include $(CLANG_LEVEL)/Makefile
diff --git a/clang/tools/libclang/Makefile b/clang/tools/libclang/Makefile
index c03f38b83ac..db3d4f86244 100644
--- a/clang/tools/libclang/Makefile
+++ b/clang/tools/libclang/Makefile
@@ -25,7 +25,7 @@ USEDLIBS = clangIndex.a clangARCMigrate.a \
clangSerialization.a \
clangParse.a clangSema.a \
clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a \
- clangRewriteCore.a \
+ clangRewrite.a \
clangAnalysis.a clangEdit.a \
clangASTMatchers.a \
clangAST.a clangLex.a clangBasic.a \
OpenPOWER on IntegriCloud