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 #78014 from swiftlang/egorzhdan/libcxx-overlay-linux

Browse Source 
[cxx-interop] Support CxxStdlib overlay for libc++ on Linux
This commit is contained in:
Egor Zhdan
2025-01-20 15:09:26 +00:00
committed by GitHub
parent d314541245 282f3b127b
commit 752cb36239
6 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -2032,6 +2032,15 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
GenericArgs.push_back(
ArgSaver.save("-cxx-interoperability-mode=" + compatVersion));
if (!langOpts.isUsingPlatformDefaultCXXStdlib() &&
langOpts.CXXStdlib == CXXStdlibKind::Libcxx) {
genericSubInvocation.getLangOptions().CXXStdlib = CXXStdlibKind::Libcxx;
genericSubInvocation.getClangImporterOptions().ExtraArgs.push_back(
"-stdlib=libc++");
GenericArgs.push_back("-Xcc");
GenericArgs.push_back("-stdlib=libc++");
}
}
}