commit 6a695cf3c273def77a2fd1cd8ec3a15225728cdf
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 e08de5d6e91748c485b1d4b1b17cf388c9c59760
parent a0068fc64351db9c47916566e3b85ab733cd8d6d

Really respect -chained-pch.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@107993 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Frontend/FrontendActions.cpp

diff --git a/lib/Frontend/FrontendActions.cpp b/lib/Frontend/FrontendActions.cpp
index 694cadc..fb0c41a 100644
--- a/lib/Frontend/FrontendActions.cpp
+++ b/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,