aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDerek Schuff <dschuff@chromium.org>2013-04-22 15:16:54 -0700
committerDerek Schuff <dschuff@chromium.org>2013-04-22 15:16:54 -0700
commit744ccd6c8bd149a17575b9d768b9a90ce06bf122 (patch)
tree7aa638a69e7dd07d5439d9e8928944fef65aff0e /tools
parent2f436965e5830fd3bc77d915c3598d47fe37a2a2 (diff)
Fix bot build of translator, renormalize CMakeLists/LLVMBuild.txt/Makefile
naming to better match upstream R=jvoung@chromium.org BUG=bot LLVM roll Review URL: https://codereview.chromium.org/14315012
Diffstat (limited to 'tools')
-rw-r--r--tools/llc/CMakeLists.txt2
-rw-r--r--tools/llc/Makefile2
-rw-r--r--tools/opt/Makefile2
-rw-r--r--tools/pnacl-abicheck/Makefile2
4 files changed, 3 insertions, 5 deletions
diff --git a/tools/llc/CMakeLists.txt b/tools/llc/CMakeLists.txt
index 908d4756cc..1f531d07d0 100644
--- a/tools/llc/CMakeLists.txt
+++ b/tools/llc/CMakeLists.txt
@@ -1,12 +1,10 @@
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
llc.cpp
)
diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index 647c24172b..63150146f4 100644
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -9,7 +9,7 @@
LEVEL := ../..
TOOLNAME := llc
-LINK_COMPONENTS := all-targets bitreader asmparser NaClAnalysis
+LINK_COMPONENTS := all-targets bitreader asmparser naclanalysis
include $(LEVEL)/Makefile.common
diff --git a/tools/opt/Makefile b/tools/opt/Makefile
index 79ed815dce..ff07e3fe4f 100644
--- a/tools/opt/Makefile
+++ b/tools/opt/Makefile
@@ -9,6 +9,6 @@
LEVEL := ../..
TOOLNAME := opt
-LINK_COMPONENTS := bitreader bitwriter asmparser instrumentation scalaropts objcarcopts ipo vectorize all-targets
+LINK_COMPONENTS := bitreader bitwriter asmparser instrumentation scalaropts objcarcopts ipo vectorize nacltransforms naclanalysis all-targets
include $(LEVEL)/Makefile.common
diff --git a/tools/pnacl-abicheck/Makefile b/tools/pnacl-abicheck/Makefile
index bd98690dd1..5f10e81ce9 100644
--- a/tools/pnacl-abicheck/Makefile
+++ b/tools/pnacl-abicheck/Makefile
@@ -9,7 +9,7 @@
LEVEL := ../..
TOOLNAME := pnacl-abicheck
-LINK_COMPONENTS := bitreader asmparser
+LINK_COMPONENTS := bitreader asmparser naclanalysis
include $(LEVEL)/Makefile.common