From ce31b34a6f9fb5c2aeb6810602f1096572217c6e Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov Date: Sun, 7 Dec 2008 16:45:37 +0000 Subject: Join tools couldn't be used in the middle of the toolchain. llvm-svn: 60665 --- llvm/tools/llvmc/driver/CompilationGraph.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'llvm/tools/llvmc/driver/CompilationGraph.cpp') diff --git a/llvm/tools/llvmc/driver/CompilationGraph.cpp b/llvm/tools/llvmc/driver/CompilationGraph.cpp index 6d7faa3dece..758268f79b9 100644 --- a/llvm/tools/llvmc/driver/CompilationGraph.cpp +++ b/llvm/tools/llvmc/driver/CompilationGraph.cpp @@ -308,7 +308,6 @@ int CompilationGraph::Build (const sys::Path& TempDir, for (std::vector::iterator B = JTV.begin(), E = JTV.end(); B != E; ++B) { - sys::Path Out; const Node* CurNode = *B; JoinTool* JT = &dynamic_cast(*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; -- cgit v1.2.3