diff options
Diffstat (limited to 'clang/tools/clang-cc/clang-cc.cpp')
| -rw-r--r-- | clang/tools/clang-cc/clang-cc.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/clang/tools/clang-cc/clang-cc.cpp b/clang/tools/clang-cc/clang-cc.cpp index 0b5a6d35a6e..5cce02ff4ba 100644 --- a/clang/tools/clang-cc/clang-cc.cpp +++ b/clang/tools/clang-cc/clang-cc.cpp @@ -377,6 +377,7 @@ std::string GetBuiltinIncludePath(const char *Argv0) { static Preprocessor * CreatePreprocessor(Diagnostic &Diags, const LangOptions &LangInfo, const PreprocessorOptions &PPOpts, + const HeaderSearchOptions &HSOpts, const DependencyOutputOptions &DepOpts, TargetInfo &Target, SourceManager &SourceMgr, FileManager &FileMgr) { @@ -413,7 +414,7 @@ CreatePreprocessor(Diagnostic &Diags, const LangOptions &LangInfo, PP->setPTHManager(PTHMgr); } - InitializePreprocessor(*PP, PPOpts); + InitializePreprocessor(*PP, PPOpts, HSOpts); // Handle generating dependencies, if requested. if (!DepOpts.OutputFile.empty()) @@ -1209,14 +1210,10 @@ int main(int argc, char **argv) { llvm::OwningPtr<Preprocessor> PP(CreatePreprocessor(Diags, CompOpts.getLangOpts(), CompOpts.getPreprocessorOpts(), + CompOpts.getHeaderSearchOpts(), CompOpts.getDependencyOutputOpts(), *Target, SourceMgr, FileMgr)); - // Apply all the options to the header search object. - ApplyHeaderSearchOptions(PP->getHeaderSearchInfo(), - CompOpts.getHeaderSearchOpts(), - CompOpts.getLangOpts(), Triple); - if (CompOpts.getPreprocessorOpts().getImplicitPCHInclude().empty()) { if (InitializeSourceManager(*PP.get(), InFile)) continue; |
