aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDerek Schuff <dschuff@chromium.org>2013-04-18 09:51:42 -0700
committerDerek Schuff <dschuff@chromium.org>2013-04-18 09:51:42 -0700
commit2f436965e5830fd3bc77d915c3598d47fe37a2a2 (patch)
treeda2931691db09515ba1e13eb310f330cf13e695c /tools
parent2b6810cd0e37368a7e8f82b1ba8fb630b9cce3ca (diff)
Fix CMake build
Clean up the LLVMBuild and CMakeLists.txt files BUG=none TEST=none Review URL: https://codereview.chromium.org/14328017
Diffstat (limited to 'tools')
-rw-r--r--tools/llc/CMakeLists.txt3
-rw-r--r--tools/opt/CMakeLists.txt2
-rw-r--r--tools/opt/LLVMBuild.txt2
-rw-r--r--tools/pnacl-abicheck/CMakeLists.txt4
-rw-r--r--tools/pnacl-abicheck/LLVMBuild.txt2
5 files changed, 7 insertions, 6 deletions
diff --git a/tools/llc/CMakeLists.txt b/tools/llc/CMakeLists.txt
index 1a8c50780e..908d4756cc 100644
--- a/tools/llc/CMakeLists.txt
+++ b/tools/llc/CMakeLists.txt
@@ -1,9 +1,10 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser NaClAnalysis)
+set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser naclanalysis)
add_llvm_tool(llc
# LOCALMOD BEGIN
# This file provides wrappers to lseek(2), read(2), etc.
nacl_file.cpp
+ SRPCStreamer.cpp
StubMaker.cpp
TextStubWriter.cpp
# LOCALMOD END
diff --git a/tools/opt/CMakeLists.txt b/tools/opt/CMakeLists.txt
index cf5e5a83cf..3b268a4205 100644
--- a/tools/opt/CMakeLists.txt
+++ b/tools/opt/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser bitwriter instrumentation scalaropts objcarcopts ipo vectorize)
+set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser bitwriter instrumentation naclanalysis nacltransforms scalaropts objcarcopts ipo vectorize)
add_llvm_tool(opt
AnalysisWrappers.cpp
diff --git a/tools/opt/LLVMBuild.txt b/tools/opt/LLVMBuild.txt
index a866d12a26..02567c2234 100644
--- a/tools/opt/LLVMBuild.txt
+++ b/tools/opt/LLVMBuild.txt
@@ -19,4 +19,4 @@
type = Tool
name = opt
parent = Tools
-required_libraries = AsmParser BitReader BitWriter IPO Instrumentation Scalar ObjCARC all-targets
+required_libraries = AsmParser BitReader BitWriter IPO Instrumentation Scalar ObjCARC all-targets NaClTransforms NaClAnalysis
diff --git a/tools/pnacl-abicheck/CMakeLists.txt b/tools/pnacl-abicheck/CMakeLists.txt
index d3296fa5a5..f75731bcf4 100644
--- a/tools/pnacl-abicheck/CMakeLists.txt
+++ b/tools/pnacl-abicheck/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(LLVM_LINK_COMPONENTS bitreader asmparser)
+set(LLVM_LINK_COMPONENTS bitreader asmparser naclanalysis)
add_llvm_tool(pnacl-abicheck
- pnacl-abicheck.cc
+ pnacl-abicheck.cpp
)
diff --git a/tools/pnacl-abicheck/LLVMBuild.txt b/tools/pnacl-abicheck/LLVMBuild.txt
index 0af322769c..92311c59b6 100644
--- a/tools/pnacl-abicheck/LLVMBuild.txt
+++ b/tools/pnacl-abicheck/LLVMBuild.txt
@@ -19,4 +19,4 @@
type = Tool
name = pnacl-abicheck
parent = Tools
-required_libraries = AsmParser BitReader
+required_libraries = AsmParser BitReader NaClAnalysis