Skip to content

Improve clang-tools wrapper #484705

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
alyssais merged 2 commits into from
Jan 28, 2026
Merged

Improve clang-tools wrapper #484705

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10b1202
clang-tools: don't include C++ include paths in $CPATH
yshui Jan 28, 2026
0273d9c
clang-tools: use $C_INCLUDE_PATH for C includes
yshui Jan 28, 2026
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
28 changes: 23 additions & 5 deletions pkgs/development/compilers/llvm/common/clang-tools/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
#!/bin/sh

buildcpath() {
local path after
while (( $# )); do
case $1 in
-isystem)
shift
path=$path${path:+':'}$1
;;
-idirafter)
shift
after=$after${after:+':'}$1
;;
esac
shift
done
echo $path${after:+':'}$after
}

buildcpluspath() {
local path after
while (( $# )); do
case $1 in
Expand Down Expand Up @@ -29,12 +47,12 @@ for arg in "$@"; do
done

if [ "$extendcpath" = true ]; then
export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
$(<@clang@/nix-support/libc-cflags))
export C_INCLUDE_PATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
$(<@clang@/nix-support/libc-cflags))

export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
$(<@clang@/nix-support/libcxx-cxxflags) \
$(<@clang@/nix-support/libc-cflags))
export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpluspath ${NIX_CFLAGS_COMPILE} \
$(<@clang@/nix-support/libcxx-cxxflags) \
$(<@clang@/nix-support/libc-cflags))
fi

@out@/bin/$(basename $0)-unwrapped "$@"
Loading