diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Frontend/CompilerInvocation.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Serialization/ASTWriter.cpp | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 3d82d7a3a60..6af36630019 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -1690,7 +1690,6 @@ 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 @@ -1711,7 +1710,6 @@ 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/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp index 43d3910acb3..ba6243a51af 100644 --- a/clang/lib/Serialization/ASTWriter.cpp +++ b/clang/lib/Serialization/ASTWriter.cpp @@ -1279,13 +1279,11 @@ 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"); @@ -1294,7 +1292,6 @@ void ASTWriter::WriteInputFiles(SourceManager &SourceMgr, SortedFiles.push_front(Entry); } } -#endif unsigned UserFilesNum = 0; // Write out all of the input files. |
