commit f525a30d19e79156642a43a39ddeb99e9c5b7068
author Sebastian Redl <sebastian.redl@getdesigned.at> Fri Jul 09 17:40:12 2010 +0000
committer Sebastian Redl <sebastian.redl@getdesigned.at> Fri Jul 09 17:40:12 2010 +0000
tree 22193cc0754ce824353638256971542ec5fcea58
parent 8ed0c0b99d09ccdcedfc04310d39a3a196d1ce18

Really respect -chained-pch.

llvm-svn: 107993

clang/lib/Frontend/FrontendActions.cpp

diff --git a/clang/lib/Frontend/FrontendActions.cpp b/clang/lib/Frontend/FrontendActions.cpp
index 694cadc..fb0c41a 100644
--- a/clang/lib/Frontend/FrontendActions.cpp
+++ b/clang/lib/Frontend/FrontendActions.cpp
@@ -80,13 +80,11 @@
   if (!OS)
     return 0;
 
-  if (CI.getFrontendOpts().RelocatablePCH)
-    return CreatePCHGenerator(CI.getPreprocessor(), OS,
-                              CI.getInvocation().getFrontendOpts().ChainedPCH ?
-			          CI.getPCHReader() : 0,
-                              Sysroot.c_str());
-
-  return CreatePCHGenerator(CI.getPreprocessor(), OS, CI.getPCHReader());
+  const PCHReader *Chain = CI.getInvocation().getFrontendOpts().ChainedPCH ?
+                               CI.getPCHReader() : 0;
+  const char *isysroot = CI.getFrontendOpts().RelocatablePCH ?
+                             Sysroot.c_str() : 0;
+  return CreatePCHGenerator(CI.getPreprocessor(), OS, Chain, isysroot);
 }
 
 ASTConsumer *InheritanceViewAction::CreateASTConsumer(CompilerInstance &CI,