Skip to content

Drop system headers from cling command line #23700

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
pcanal merged 1 commit into from
Oct 14, 2026
Merged

Drop system headers from cling command line #23700

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
11 changes: 9 additions & 2 deletions core/dictgen/src/rootcling_impl.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4047,8 +4047,15 @@ int RootClingMain(int argc,
for (const std::string &PPUndefine : gOptPPUndefines)
clingArgs.push_back(std::string("-U") + PPUndefine);

for (const std::string &IncludePath : gOptIncludePaths)
clingArgs.push_back(std::string("-I") + llvm::sys::path::convert_to_slash(IncludePath));
for (const std::string &IncludePath : gOptIncludePaths) {
// Do not promote compiler default include directories (e.g. the macOS SDK's
// usr/include, which find_package(ZLIB) reports) to -I: they would then be
// searched before clang's resource directory, and be stored in the
// dictionary payload for the runtime interpreter to do the same.
if (std::find(gOptCompDefaultIncludePaths.begin(), gOptCompDefaultIncludePaths.end(), IncludePath)
Comment thread
pcanal marked this conversation as resolved.
== gOptCompDefaultIncludePaths.end())
clingArgs.push_back(std::string("-I") + llvm::sys::path::convert_to_slash(IncludePath));
}

for (const std::string &IncludePath : gOptSysIncludePaths) {
// Prevent mentioning compiler default include directories as -isystem
Expand Down
Loading