aboutsummaryrefslogtreecommitdiff
path: root/lib/FrontendTool/ExecuteCompilerInvocation.cpp
diff options
context:
space:
mode:
authorArgyrios Kyrtzidis <akyrtzi@gmail.com>2012-02-04 03:26:16 +0000
committerArgyrios Kyrtzidis <akyrtzi@gmail.com>2012-02-04 03:26:16 +0000
commite839806cad021306510f72da63217ba57648929e (patch)
treeb610e540a8a745659bb952faf3a0ef6ebf44f871 /lib/FrontendTool/ExecuteCompilerInvocation.cpp
parent893242f37c1d37644b66e932227adfb1c48885c0 (diff)
Fix ASTMerge tests that I broke in my previous commit.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@149759 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/FrontendTool/ExecuteCompilerInvocation.cpp')
-rw-r--r--lib/FrontendTool/ExecuteCompilerInvocation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/lib/FrontendTool/ExecuteCompilerInvocation.cpp
index cfb185ec52..aef8474b8c 100644
--- a/lib/FrontendTool/ExecuteCompilerInvocation.cpp
+++ b/lib/FrontendTool/ExecuteCompilerInvocation.cpp
@@ -114,7 +114,7 @@ static FrontendAction *CreateFrontendAction(CompilerInstance &CI) {
// If there are any AST files to merge, create a frontend action
// adaptor to perform the merge.
if (!FEOpts.ASTMergeFiles.empty())
- Act = new ASTMergeAction(Act, FEOpts.ASTMergeFiles[0]);
+ Act = new ASTMergeAction(Act, FEOpts.ASTMergeFiles);
return Act;
}