From 994deb2bf1372d5abee5ca9d98c68633072ec837 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 21 Nov 2022 20:40:22 +0800 Subject: [PATCH] cc-wrapper: fix path to libcxx includes for cross compilers --- pkgs/build-support/cc-wrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 14cd1d431391..a59505d08258 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 ''