]> granicus.if.org Git - clang/commitdiff
Really respect -chained-pch.
authorSebastian Redl <sebastian.redl@getdesigned.at>
Fri, 9 Jul 2010 17:40:12 +0000 (17:40 +0000)
committerSebastian Redl <sebastian.redl@getdesigned.at>
Fri, 9 Jul 2010 17:40:12 +0000 (17:40 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@107993 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Frontend/FrontendActions.cpp

index 694cadcd13c063d01483d075e8f4926b5613bd90..fb0c41a68b914e7ebdd3d334d5e2af9777ff3f1a 100644 (file)
@@ -80,13 +80,11 @@ ASTConsumer *GeneratePCHAction::CreateASTConsumer(CompilerInstance &CI,
   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,