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-24 00:38:13 -07:00
parent 93dbf11511 7c6f1cc2a5
commit 51cea01bf7
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/ModuleFile.cpp
View File

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