Skip to content

Revert "[cxx-interop] Allow Swift to extract libstdc++ installation path from Clang" #4930

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 1 commit into from
Jul 5, 2022
Merged

Revert "[cxx-interop] Allow Swift to extract libstdc++ installation path from Clang" #4930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions clang/include/clang/Driver/Driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,18 +565,6 @@ class Driver {
return IsOffload ? OffloadLTOMode : LTOMode;
}

/// Addition for Swift. Allows ClangImporter to extract the path to libstdc++.
std::vector<std::string>
getLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
const llvm::Triple &Target) const {
llvm::opt::ArgStringList ArgStrings;
getToolChain(DriverArgs, Target)
.addLibStdCxxIncludePaths(DriverArgs, ArgStrings);
unsigned Unused1, Unused2;
auto ParsedArgs = getOpts().ParseArgs(ArgStrings, Unused1, Unused2);
return ParsedArgs.getAllArgValues(options::OPT_internal_isystem);
}

private:

/// Tries to load options from configuration file.
Expand Down
5 changes: 0 additions & 5 deletions clang/include/clang/Driver/ToolChain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,6 @@ class ToolChain {
llvm::vfs::FileSystem &getVFS() const;
const llvm::Triple &getTriple() const { return Triple; }

/// Addition for Swift. Allows ClangImporter to extract the path to libstdc++.
virtual void
addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
llvm::opt::ArgStringList &CC1Args) const {};

/// Get the toolchain's aux triple, if it has one.
///
/// Exactly what the aux triple represents depends on the toolchain, but for
Expand Down