intel: reorder wrapper isystems

This commit is contained in:
Aleix Boné 2025-05-19 18:21:03 +02:00
parent edf1424aef
commit 5c2d9fe67c
Signed by: abonerib
SSH Key Fingerprint: SHA256:Jmq7aNH8XDdGy7E9dqfqrc/LRaVqhnFgDgdxlFw/pl8

View File

@ -55,6 +55,12 @@ let
echo "--gcc-toolchain=${gcc.cc}" >> $out/nix-support/libcxx-cxxflags echo "--gcc-toolchain=${gcc.cc}" >> $out/nix-support/libcxx-cxxflags
# For some reason, If we don't resolve the realpath things go wrong
for stddef in ${cc}/lib/clang/*/include/stddef.h ; do
dir=$(dirname $(realpath "$stddef"))
echo "-isystem $dir" >> $out/nix-support/cc-cflags
done
for dir in ${gcc.cc}/include/c++/*; do for dir in ${gcc.cc}/include/c++/*; do
echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
done done
@ -68,12 +74,6 @@ let
# Disable hardening by default # Disable hardening by default
echo "" > $out/nix-support/add-hardening.sh echo "" > $out/nix-support/add-hardening.sh
# For some reason, If we don't resolve the realpath things go wrong
for stddef in ${cc}/lib/clang/*/include/stddef.h ; do
dir=$(dirname $(realpath "$stddef"))
echo "-isystem $dir" >> $out/nix-support/cc-cflags
done
'' + extraBuildCommands; '' + extraBuildCommands;
} // (removeAttrs args ["cc" "extraBuildCommands" "extraInstall"]) } // (removeAttrs args ["cc" "extraBuildCommands" "extraInstall"])
).overrideAttrs (old: { ).overrideAttrs (old: {