[llvm-branch-commits] [cfe-branch] r115281 - /cfe/branches/Apple/whitney/lib/Frontend/ASTUnit.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Thu Sep 30 22:42:13 2010
New Revision: 115281

URL: http://llvm.org/viewvc/llvm-project?rev=115281&view=rev
Log:
Merge r115260:
--
Author: Douglas Gregor <dgregor at apple.com>
Date:   Fri Oct 1 01:05:22 2010 +0000

    Enable chained precompiled headers for use with precompiled preambles

Modified:
    cfe/branches/Apple/whitney/lib/Frontend/ASTUnit.cpp

Modified: cfe/branches/Apple/whitney/lib/Frontend/ASTUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Frontend/ASTUnit.cpp?rev=115281&r1=115280&r2=115281&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Frontend/ASTUnit.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Frontend/ASTUnit.cpp Thu Sep 30 22:42:13 2010
@@ -1169,9 +1169,7 @@
   
   // Tell the compiler invocation to generate a temporary precompiled header.
   FrontendOpts.ProgramAction = frontend::GeneratePCH;
-  // FIXME: Set ChainedPCH unconditionally, once it is ready.
-  if (::getenv("LIBCLANG_CHAINING"))
-    FrontendOpts.ChainedPCH = true;
+  FrontendOpts.ChainedPCH = true;
   // FIXME: Generate the precompiled header into memory?
   FrontendOpts.OutputFile = PreamblePCHPath;