diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-02-04 03:26:16 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-02-04 03:26:16 +0000 |
| commit | bd6a7d4c6c413bc5a55e8bba3b0f30335b0387c5 (patch) | |
| tree | d4d30df034234fbffc28264d354c1acc4c9858d8 /clang/lib/FrontendTool | |
| parent | e788fac623f84d59e8fc1434e15b70b6685f97e6 (diff) | |
| download | bcm5719-llvm-bd6a7d4c6c413bc5a55e8bba3b0f30335b0387c5.tar.gz bcm5719-llvm-bd6a7d4c6c413bc5a55e8bba3b0f30335b0387c5.zip | |
Fix ASTMerge tests that I broke in my previous commit.
llvm-svn: 149759
Diffstat (limited to 'clang/lib/FrontendTool')
| -rw-r--r-- | clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp index cfb185ec524..aef8474b8c7 100644 --- a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp +++ b/clang/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; } |
