diff options
| author | Nick Cao <nickcao@nichi.co> | 2022-11-21 20:40:22 +0800 |
|---|---|---|
| committer | Rick van Schijndel <Mindavi@users.noreply.github.com> | 2022-11-30 18:46:16 +0100 |
| commit | 994deb2bf1372d5abee5ca9d98c68633072ec837 (patch) | |
| tree | 407e428eef1d975cac5d7abe6afcbe3b924c9768 /pkgs/build-support | |
| parent | c79f09b7e5bb39eb9ead58c99ab87cb271461080 (diff) | |
cc-wrapper: fix path to libcxx includes for cross compilers
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 14cd1d4313916..a59505d082584 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -366,10 +366,10 @@ stdenv.mkDerivation { touch "$out/nix-support/libcxx-ldflags" '' + 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 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 done '' |