summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvmc
diff options
context:
space:
mode:
authorMikhail Glushenkov <foldr@codedgers.com>2008-12-07 16:45:37 +0000
committerMikhail Glushenkov <foldr@codedgers.com>2008-12-07 16:45:37 +0000
commitce31b34a6f9fb5c2aeb6810602f1096572217c6e (patch)
tree75cd38f970297e896713ec017b22f72223783317 /llvm/tools/llvmc
parent4cc945da6e1439228ebdbbc5df93f003501e2b45 (diff)
downloadbcm5719-llvm-ce31b34a6f9fb5c2aeb6810602f1096572217c6e.tar.gz
bcm5719-llvm-ce31b34a6f9fb5c2aeb6810602f1096572217c6e.zip
Join tools couldn't be used in the middle of the toolchain.
llvm-svn: 60665
Diffstat (limited to 'llvm/tools/llvmc')
-rw-r--r--llvm/tools/llvmc/driver/CompilationGraph.cpp9
1 files changed, 4 insertions, 5 deletions
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<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;
OpenPOWER on IntegriCloud