Skip to content

Add --cxxflags option to cpp-rule-preprocessor #188

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
nunoplopes merged 1 commit into from
Jun 12, 2026
Merged

Add --cxxflags option to cpp-rule-preprocessor #188

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
16 changes: 14 additions & 2 deletions cpp2rust/cpp_rule_preprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
#include <clang/Sema/Template.h>
#include <clang/Tooling/CompilationDatabase.h>
#include <clang/Tooling/Tooling.h>
#include <llvm/ADT/ArrayRef.h>
#include <llvm/ADT/SmallVector.h>
#include <llvm/ADT/StringRef.h>
#include <llvm/Support/CommandLine.h>
#include <llvm/Support/FormatVariadic.h>
#include <llvm/Support/JSON.h>
Expand Down Expand Up @@ -760,8 +763,10 @@ class ActionFactory : public clang::tooling::FrontendActionFactory {
Callback cb_;
};

void Extract(const std::filesystem::path &src_path, llvm::json::Object &out) {
void Extract(const std::filesystem::path &src_path, llvm::json::Object &out,
llvm::ArrayRef<llvm::StringRef> cxx_flags) {
auto flags = getPlatformClangBeginFlags();
flags.insert(flags.end(), cxx_flags.begin(), cxx_flags.end());
auto end_flags = getPlatformClangEndFlags();
flags.insert(flags.end(), end_flags.begin(), end_flags.end());
clang::tooling::FixedCompilationDatabase compilations(".", flags);
Expand All @@ -788,12 +793,19 @@ llvm::cl::opt<std::string>
llvm::cl::value_desc("out.json"), llvm::cl::Required,
llvm::cl::cat(cat));

llvm::cl::list<std::string> CXXFlags("cxxflags",
llvm::cl::desc("Additional CXXFLAGS"),
llvm::cl::value_desc("cxxflags"),
llvm::cl::ZeroOrMore, llvm::cl::cat(cat));

} // namespace

int main(int argc, char *argv[]) {
llvm::cl::HideUnrelatedOptions(cat);
llvm::cl::ParseCommandLineOptions(argc, argv);

llvm::SmallVector<llvm::StringRef, 4> cxx_flags(CXXFlags.begin(),
CXXFlags.end());
fs::path dir = SrcDir.getValue();
llvm::json::Object root;
for (const char *name : {"src.c", "src.cpp"}) {
Expand All @@ -803,7 +815,7 @@ int main(int argc, char *argv[]) {
}
llvm::errs() << "Preprocessing " << path.string() << '\n';
llvm::json::Object file_root;
cpp2rust::Extract(path, file_root);
cpp2rust::Extract(path, file_root, cxx_flags);
for (auto &[k, v] : file_root) {
if (!root.try_emplace(k, std::move(v)).second) {
llvm::errs() << "ERROR: rule name " << k.str()
Expand Down
Loading