Build CompilerDriver library.

llvm-svn: 127554

2 files changed, 7 insertions, 4 deletions

diff --git a/llvm/lib/CMakeLists.txt b/llvm/lib/CMakeLists.txt
index e2838c373a3..80118f08191 100644
--- a/llvm/lib/CMakeLists.txt
+++ b/llvm/lib/CMakeLists.txt
@@ -7,6 +7,7 @@ add_subdirectory(Transforms)
 add_subdirectory(Linker)
 add_subdirectory(Analysis)
 add_subdirectory(MC)
+add_subdirectory(CompilerDriver)
 add_subdirectory(Object)
 add_subdirectory(ExecutionEngine)
 add_subdirectory(Target)
diff --git a/llvm/lib/CompilerDriver/CMakeLists.txt b/llvm/lib/CompilerDriver/CMakeLists.txt
index 2248de01b95..a12b3378aaf 100644
--- a/llvm/lib/CompilerDriver/CMakeLists.txt
+++ b/llvm/lib/CompilerDriver/CMakeLists.txt
@@ -1,10 +1,12 @@
 set(LLVM_LINK_COMPONENTS support)
-set(LLVM_REQUIRES_EH 1)
 
-add_llvm_tool(llvmc
+# We don't want this library to appear in `llvm-config --libs` output,
+# so its name doesn't start with "LLVM".
+
+add_llvm_library(CompilerDriver
   Action.cpp
+  BuiltinOptions.cpp
   CompilationGraph.cpp
-  llvmc.cpp
-  Plugin.cpp
+  Main.cpp
   Tool.cpp
   )