[cfe-commits] r107993 - /cfe/trunk/lib/Frontend/FrontendActions.cpp

[Sebastian Redl]

Author: cornedbee
Date: Fri Jul  9 12:40:12 2010
New Revision: 107993

URL: http://llvm.org/viewvc/llvm-project?rev=107993&view=rev
Log:
Really respect -chained-pch.

Modified:
    cfe/trunk/lib/Frontend/FrontendActions.cpp

Modified: cfe/trunk/lib/Frontend/FrontendActions.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/FrontendActions.cpp?rev=107993&r1=107992&r2=107993&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/FrontendActions.cpp (original)
+++ cfe/trunk/lib/Frontend/FrontendActions.cpp Fri Jul  9 12:40:12 2010
@@ -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,