Revert r182331, these checks should be based on the target not the host.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@182333 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index 3d82d7a..6af3663 100644
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -1690,7 +1690,6 @@
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 @@
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 43d3910..ba6243a 100644
--- a/lib/Serialization/ASTWriter.cpp
+++ b/lib/Serialization/ASTWriter.cpp
@@ -1279,13 +1279,11 @@
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 @@
SortedFiles.push_front(Entry);
}
}
-#endif
unsigned UserFilesNum = 0;
// Write out all of the input files.