Skip to content

Commit 06c963b

Browse files
authored
Merge pull request #62776 from buttaface/cxx
[cxx-interop][android] Exclude Android from the list of platforms to link against the swiftstd library
2 parents 3c47c4f + a86b25a commit 06c963b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/IRGen/GenDecl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ void IRGenModule::emitSourceFile(SourceFile &SF) {
492492

493493
// Only link with std on platforms where the overlay is available.
494494
// Do not try to link std with itself.
495-
if ((target.isOSDarwin() || target.isOSLinux()) &&
495+
if ((target.isOSDarwin() || (target.isOSLinux() && !target.isAndroid())) &&
496496
!getSwiftModule()->getName().is("Cxx") &&
497497
!getSwiftModule()->getName().is("CxxStdlib") &&
498498
!getSwiftModule()->getName().is("std")) {

0 commit comments

Comments
 (0)