Manually update the dependencies in the Makefiles. It turns out that all

that work on the LLVMBuild based dependency specification didn't
actually work, we just now maintain dependencies in *3* places instead
of 2. Yay.

There may still be some missing dependencies, I'm still sifting through
the bots and my builds, but this is a step in the right direction.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@177988 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/bugpoint/Makefile b/tools/bugpoint/Makefile
index 65ffc13022f22178ad846ab85e21084a6e97dc59..20493218b0646df24cd30676b972e611696e408a 100644 (file)
--- a/tools/bugpoint/Makefile
+++ b/tools/bugpoint/Makefile
@@ -10,6 +10,6 @@
 LEVEL := ../..
 TOOLNAME := bugpoint
 LINK_COMPONENTS := asmparser instrumentation scalaropts ipo linker bitreader \
-                   bitwriter vectorize objcarcopts
+                   bitwriter irreader vectorize objcarcopts
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index b32d5575d53ec2827a25acea2d1294785fce14a5..c24f378bc53891d2c94be103d6c06e5bbf868c71 100644 (file)
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL := ../..
 TOOLNAME := llc
-LINK_COMPONENTS := all-targets bitreader asmparser
+LINK_COMPONENTS := all-targets bitreader asmparser irreader
 
 include $(LEVEL)/Makefile.common
 

diff --git a/tools/lli/Makefile b/tools/lli/Makefile
index 85ac6b46bb5b2e9a6a659595279da38e3420a917..a6530584a2e9c33b4799cb789d410f5c03199ebf 100644 (file)
--- a/tools/lli/Makefile
+++ b/tools/lli/Makefile
@@ -12,7 +12,7 @@ TOOLNAME := lli
 
 include $(LEVEL)/Makefile.config
 
-LINK_COMPONENTS := mcjit jit interpreter nativecodegen bitreader asmparser selectiondag native
+LINK_COMPONENTS := mcjit jit interpreter nativecodegen bitreader asmparser irreader selectiondag native
 
 # If Intel JIT Events support is confiured, link against the LLVM Intel JIT
 # Events interface library

diff --git a/tools/llvm-diff/Makefile b/tools/llvm-diff/Makefile
index f7fa7159c54f09d03ce8462722d005ea2d04dc4f..bd97a6a9f5e92cb60a1daf9691008f4eeb95c059 100644 (file)
--- a/tools/llvm-diff/Makefile
+++ b/tools/llvm-diff/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL := ../..
 TOOLNAME := llvm-diff
-LINK_COMPONENTS := asmparser bitreader
+LINK_COMPONENTS := asmparser bitreader irreader
 
 # This tool has no plugins, optimize startup time.
 TOOL_NO_EXPORTS := 1

diff --git a/tools/llvm-extract/Makefile b/tools/llvm-extract/Makefile
index a1e93f5ce468c692dbb56de04888efad94b6af03..d371c54759263a83a244cf40dd2e9a2b4691339a 100644 (file)
--- a/tools/llvm-extract/Makefile
+++ b/tools/llvm-extract/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL := ../..
 TOOLNAME := llvm-extract
-LINK_COMPONENTS := ipo bitreader bitwriter asmparser
+LINK_COMPONENTS := ipo bitreader bitwriter asmparser irreader
 
 # This tool has no plugins, optimize startup time.
 TOOL_NO_EXPORTS := 1

diff --git a/tools/llvm-jitlistener/Makefile b/tools/llvm-jitlistener/Makefile
index 30182355c9c08fa8d76e7e180302ae1027273fd1..b13222731745215430fc1c62f6cae1f1a27b33e3 100644 (file)
--- a/tools/llvm-jitlistener/Makefile
+++ b/tools/llvm-jitlistener/Makefile
@@ -12,7 +12,7 @@ TOOLNAME := llvm-jitlistener
 \r
 include $(LEVEL)/Makefile.config\r
 \r
-LINK_COMPONENTS := mcjit jit interpreter nativecodegen bitreader asmparser selectiondag Object\r
+LINK_COMPONENTS := mcjit jit interpreter nativecodegen bitreader asmparser irreader selectiondag Object\r
 \r
 # If Intel JIT Events support is configured, link against the LLVM Intel JIT\r
 # Events interface library.  If not, this tool will do nothing useful, but it\r

diff --git a/tools/llvm-link/Makefile b/tools/llvm-link/Makefile
index 2553db0cd39cc891f8d353167f2a50209e54997e..ed30d2d256b8eb2aab05893b7eced6c90536f7d5 100644 (file)
--- a/tools/llvm-link/Makefile
+++ b/tools/llvm-link/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL := ../..
 TOOLNAME := llvm-link
-LINK_COMPONENTS := linker bitreader bitwriter asmparser
+LINK_COMPONENTS := linker bitreader bitwriter asmparser irreader
 
 # This tool has no plugins, optimize startup time.
 TOOL_NO_EXPORTS := 1

diff --git a/tools/llvm-stress/Makefile b/tools/llvm-stress/Makefile
index 90d57c3fa98ac31fd1b88e7fc1333493fd9fdf3f..8767cbe4176781a8070302ab16ccc91028d0e19b 100644 (file)
--- a/tools/llvm-stress/Makefile
+++ b/tools/llvm-stress/Makefile
@@ -10,7 +10,7 @@
 LEVEL := ../..
 TOOLNAME := llvm-stress
 LINK_COMPONENTS := object
-LINK_COMPONENTS := bitreader bitwriter asmparser instrumentation scalaropts ipo
+LINK_COMPONENTS := bitreader bitwriter asmparser irreader instrumentation scalaropts ipo
 
 # This tool has no plugins, optimize startup time.
 TOOL_NO_EXPORTS = 1

diff --git a/tools/opt/Makefile b/tools/opt/Makefile
index 79ed815dcec828dd863582d25684e3bf787c9eb2..a451005574a55b591a0aeb04799ebcd86d635e5d 100644 (file)
--- 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 irreader instrumentation scalaropts objcarcopts ipo vectorize all-targets
 
 include $(LEVEL)/Makefile.common