From: Richard Smith Date: Mon, 20 May 2013 23:17:08 +0000 (+0000) Subject: Move two Darwin-specific hacks into #ifdef __APPLE__. These were stat'ing X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7efb8af368309b5a2e5f9fa4df6da136d1c5ac54;p=clang Move two Darwin-specific hacks into #ifdef __APPLE__. These were stat'ing nonexistent Darwin-specific files on every module build. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@182331 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 6af3663001..3d82d7a3a6 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -1690,6 +1690,7 @@ std::string CompilerInvocation::getModuleHash() const { hsOpts.UseStandardCXXIncludes, hsOpts.UseLibcxx); +#ifdef __APPLE__ // Darwin-specific hack: if we have a sysroot, use the contents and // modification time of // $sysroot/System/Library/CoreServices/SystemVersion.plist @@ -1710,6 +1711,7 @@ std::string CompilerInvocation::getModuleHash() const { code = hash_combine(code, statBuf.st_mtime); } } +#endif return llvm::APInt(64, code).toString(36, /*Signed=*/false); } diff --git a/lib/Serialization/ASTWriter.cpp b/lib/Serialization/ASTWriter.cpp index ba6243a51a..43d3910acb 100644 --- a/lib/Serialization/ASTWriter.cpp +++ b/lib/Serialization/ASTWriter.cpp @@ -1279,11 +1279,13 @@ void ASTWriter::WriteInputFiles(SourceManager &SourceMgr, SortedFiles.push_front(Entry); } + FileManager &FileMgr = SourceMgr.getFileManager(); + +#ifdef __APPLE__ // If we have an isysroot for a Darwin SDK, include its SDKSettings.plist in // the set of (non-system) input files. This is simple heuristic for // detecting whether the system headers may have changed, because it is too // expensive to stat() all of the system headers. - FileManager &FileMgr = SourceMgr.getFileManager(); if (!HSOpts.Sysroot.empty() && !Chain) { llvm::SmallString<128> SDKSettingsFileName(HSOpts.Sysroot); llvm::sys::path::append(SDKSettingsFileName, "SDKSettings.plist"); @@ -1292,6 +1294,7 @@ void ASTWriter::WriteInputFiles(SourceManager &SourceMgr, SortedFiles.push_front(Entry); } } +#endif unsigned UserFilesNum = 0; // Write out all of the input files.