diff options
| author | Mikhail Glushenkov <foldr@codedgers.com> | 2008-12-07 16:45:37 +0000 |
|---|---|---|
| committer | Mikhail Glushenkov <foldr@codedgers.com> | 2008-12-07 16:45:37 +0000 |
| commit | b677df82ed664c293d3699d84193aac369dadaa1 (patch) | |
| tree | f4e6fddd413a294ceec8d4036ebbfc92ce4c9b62 /tools/llvmc/driver | |
| parent | ad889a7f8822184e5c3a979dabefce999cd88fda (diff) | |
| download | llvm-b677df82ed664c293d3699d84193aac369dadaa1.tar.gz llvm-b677df82ed664c293d3699d84193aac369dadaa1.tar.bz2 llvm-b677df82ed664c293d3699d84193aac369dadaa1.tar.xz | |
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
Diffstat (limited to 'tools/llvmc/driver')
| -rw-r--r-- | tools/llvmc/driver/CompilationGraph.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/llvmc/driver/CompilationGraph.cpp b/tools/llvmc/driver/CompilationGraph.cpp index 6d7faa3dec..758268f79b 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; |