fixup! intel: reorder wrapper isystems

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

View File

@ -46,6 +46,12 @@ let
in (wrapCCWith { in (wrapCCWith {
inherit cc; inherit cc;
extraBuildCommands = '' extraBuildCommands = ''
# 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
echo "-isystem ${cc}/include" >> $out/nix-support/cc-cflags echo "-isystem ${cc}/include" >> $out/nix-support/cc-cflags
echo "-isystem ${cc}/include/intel64" >> $out/nix-support/cc-cflags echo "-isystem ${cc}/include/intel64" >> $out/nix-support/cc-cflags
@ -55,12 +61,6 @@ 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