Skip to content

FreeBSD: Link C++ runtimes when Cxx interop is enabled #82355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 23, 2025
Merged

FreeBSD: Link C++ runtimes when Cxx interop is enabled #82355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3376785
Use C++ driver when C++ interop is enabled
etcwilde Jun 17, 2025
91aa7b8
FreeBSD: Autolink C++ runtime
etcwilde Jun 18, 2025
3a48d6e
FreeBSD: Enable a few more C++ interop tests
etcwilde Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/AST/ModuleDependencies.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,8 @@ void swift::dependencies::registerCxxInteropLibraries(
return mainModuleName == Name;
})) {
// Only link with CxxStdlib on platforms where the overlay is available.
if (Target.isOSDarwin() || Target.isOSLinux() || Target.isOSWindows())
if (Target.isOSDarwin() || Target.isOSLinux() || Target.isOSWindows() ||
Target.isOSFreeBSD())
RegistrationCallback(LinkLibrary{"swiftCxxStdlib", LibraryKind::Library,
hasStaticCxxStdlib});
}
Expand Down
7 changes: 4 additions & 3 deletions lib/Driver/ToolChains.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,9 +1656,10 @@ const char *ToolChain::getClangLinkerDriver(
// a C++ standard library if it's not needed, in particular because the
// standard library that `clang++` selects by default may not be the one that
// is desired.
const char *LinkerDriver =
Args.hasArg(options::OPT_enable_experimental_cxx_interop) ? "clang++"
: "clang";
bool useCxxLinker = Args.hasArg(options::OPT_enable_experimental_cxx_interop);
if (Arg *arg = Args.getLastArg(options::OPT_cxx_interoperability_mode))
useCxxLinker |= StringRef(arg->getValue()) != "off";
const char *LinkerDriver = useCxxLinker ? "clang++" : "clang";
if (const Arg *A = Args.getLastArg(options::OPT_tools_directory)) {
StringRef toolchainPath(A->getValue());

Expand Down
3 changes: 2 additions & 1 deletion lib/Frontend/CompilerInvocation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,8 @@ void CompilerInvocation::computeCXXStdlibOptions() {
// (see https://reviews.llvm.org/D101479).
LangOpts.CXXStdlib = CXXStdlibKind::Msvcprt;
LangOpts.PlatformDefaultCXXStdlib = CXXStdlibKind::Msvcprt;
} else if (LangOpts.Target.isOSLinux() || LangOpts.Target.isOSDarwin()) {
} else if (LangOpts.Target.isOSLinux() || LangOpts.Target.isOSDarwin() ||
LangOpts.Target.isOSFreeBSD()) {
auto [clangDriver, clangDiagEngine] =
ClangImporter::createClangDriver(LangOpts, ClangImporterOpts);
auto clangDriverArgs = ClangImporter::createClangArgs(
Expand Down
2 changes: 1 addition & 1 deletion test/Interop/Cxx/stdlib/avoid-import-cxx-math.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// RUN: %target-swift-frontend %s -typecheck -verify -cxx-interoperability-mode=swift-6
// RUN: %target-swift-frontend %s -typecheck -verify -cxx-interoperability-mode=upcoming-swift

// REQUIRES: OS=macosx || OS=linux-gnu
// REQUIRES: OS=macosx || OS=linux-gnu || OS=freebsd

import CxxStdlib

Expand Down
2 changes: 1 addition & 1 deletion test/Interop/Cxx/stdlib/overlay/custom-sequence.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
//
// REQUIRES: executable_test
// REQUIRES: OS=macosx || OS=linux-gnu
// REQUIRES: OS=macosx || OS=linux-gnu || OS=freebsd

// REQUIRES: rdar102364960

Expand Down
2 changes: 1 addition & 1 deletion test/Interop/Cxx/stdlib/use-std-map.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

// REQUIRES: executable_test
//
// REQUIRES: OS=macosx || OS=linux-gnu
// REQUIRES: OS=macosx || OS=linux-gnu || OS=freebsd

import StdlibUnittest
#if !BRIDGING_HEADER
Expand Down