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 remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift_jenkins
2020-04-17 21:17:31 -07:00
parent 0d307776e8 22cdddd84e
commit 1acb641f2c
18 changed files with 119 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Serialization/ModuleFile.cpp
View File

@@ -1341,6 +1341,9 @@ static bool areCompatibleArchitectures(const llvm::Triple &moduleTarget,
static bool areCompatibleOSs(const llvm::Triple &moduleTarget,
const llvm::Triple &ctxTarget) {
if (moduleTarget.getEnvironment() != ctxTarget.getEnvironment())
return false;
if (moduleTarget.getOS() == ctxTarget.getOS())
return true;