Skip to content

Prioritise headers provided by dependencies over system headers #99

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
chrisnovakovic merged 1 commit into from
Nov 28, 2025
Merged

Prioritise headers provided by dependencies over system headers #99

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
4 changes: 3 additions & 1 deletion build_defs/cc.build_defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,8 @@ def _library_cmds(c:bool=False, compiler_flags:list=[], pkg_config_libs:list=[],
# "only run preprocess, compile and assemble steps").
common_flags = [] if any([cf in _ACTION_FLAGS for cf in compiler_flags]) else ["-c"]

# Prepend the current directory to the header search path. This takes precedence over any header directories that
# this target inherits from its dependencies.
common_flags += ["-I", "."]
dbg_flags = _build_flags(compiler_flags, pkg_config_libs, pkg_config_cflags, defines, c=c, dbg=True)
opt_flags = _build_flags(compiler_flags, pkg_config_libs, pkg_config_cflags, defines, c=c)
Expand Down Expand Up @@ -900,7 +902,7 @@ def _library_apply_labels(c:bool=False, compiler_flags:list=[], pkg_config_libs:
# Only the headers for this library's direct dependencies should be collected - transitive dependencies aren't
# needed at compile time, and just pollute the build environment.
for l in get_labels(name, "cc:inc:", maxdepth=1):
flags += ["-isystem", l]
flags += ["-I", l]
for l in get_labels(name, "cc:"):
if l.startswith("pc:") and l[3:] not in pkg_config_libs:
pkg_config_libs += [l[3:]]
Expand Down