averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58620 from bnbarham/rebranch-fixes

Browse Source 
[rebranch] Various fixes to get macos to a compiling state
This commit is contained in:
Ben Barham
2022-05-06 09:59:38 -07:00
committed by GitHub
parent a3fdb90778 ba3f582155
commit 4e1eb1abe8
47 changed files with 232 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Serialization/ModuleFile.cpp
View File

@@ -79,15 +79,15 @@ static bool areCompatibleOSs(const llvm::Triple &moduleTarget,
static bool isTargetTooNew(const llvm::Triple &moduleTarget,
const llvm::Triple &ctxTarget) {
unsigned major, minor, micro;
if (moduleTarget.isMacOSX()) {
moduleTarget.getMacOSXVersion(major, minor, micro);
return ctxTarget.isMacOSXVersionLT(major, minor, micro);
llvm::VersionTuple osVersion;
moduleTarget.getMacOSXVersion(osVersion);
// TODO: Add isMacOSXVersionLT(Triple) API (or taking a VersionTuple)
return ctxTarget.isMacOSXVersionLT(osVersion.getMajor(),
osVersion.getMinor().getValueOr(0),
osVersion.getSubminor().getValueOr(0));
}
moduleTarget.getOSVersion(major, minor, micro);
return ctxTarget.isOSVersionLT(major, minor, micro);
return ctxTarget.isOSVersionLT(moduleTarget);
}
ModuleFile::ModuleFile(std::shared_ptr<const ModuleFileSharedCore> core)