From: Mikhail Glushenkov <foldr@codedgers.com>
Date: Sun, 7 Dec 2008 16:45:37 +0000 (+0000)
Subject: Join tools couldn't be used in the middle of the toolchain.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b677df82ed664c293d3699d84193aac369dadaa1;p=oota-llvm.git

Join tools couldn't be used in the middle of the toolchain.

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

diff --git a/tools/llvmc/driver/CompilationGraph.cpp b/tools/llvmc/driver/CompilationGraph.cpp
index 6d7faa3dece..758268f79b9 100644
--- a/tools/llvmc/driver/CompilationGraph.cpp
+++ b/tools/llvmc/driver/CompilationGraph.cpp
@@ -308,7 +308,6 @@ int CompilationGraph::Build (const sys::Path& TempDir,
   for (std::vector<const Node*>::iterator B = JTV.begin(), E = JTV.end();
        B != E; ++B) {
 
-    sys::Path Out;
     const Node* CurNode = *B;
     JoinTool* JT = &dynamic_cast<JoinTool&>(*CurNode->ToolPtr.getPtr());
 
@@ -325,10 +324,10 @@ int CompilationGraph::Build (const sys::Path& TempDir,
     if (CurAction.StopCompilation())
       return 0;
 
-    const Node* NextNode =
-      &getNode(ChooseEdge(CurNode->OutEdges, InLangs,
-                          CurNode->Name())->ToolName());
-      PassThroughGraph(Out, NextNode, InLangs, TempDir, LangMap);
+    const Node* NextNode = &getNode(ChooseEdge(CurNode->OutEdges, InLangs,
+                                               CurNode->Name())->ToolName());
+    PassThroughGraph(sys::Path(CurAction.OutFile()), NextNode,
+                     InLangs, TempDir, LangMap);
   }
 
   return 0;