JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cc-wrapper: fix path to libcxx includes for cross compilers

Browse Source
This commit is contained in:
Nick Cao 2022-11-21 20:40:22 +08:00 committed by Rick van Schijndel
parent c79f09b7e5
commit 994deb2bf1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/cc-wrapper/default.nix
View File

@ -366,10 +366,10 @@ stdenv.mkDerivation {
touch "$out/nix-support/libcxx-ldflags" touch "$out/nix-support/libcxx-ldflags"
'' ''
+ optionalString (libcxx == null && (useGccForLibs && gccForLibs.langCC or false)) '' + optionalString (libcxx == null && (useGccForLibs && gccForLibs.langCC or false)) ''
for dir in ${gccForLibs}/include/c++/*; do for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*; do
echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
done done
for dir in ${gccForLibs}/include/c++/*/${targetPlatform.config}; do for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*/${targetPlatform.config}; do
echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
done done
'' ''