From 6b03c5677a2cd71a27f7fb1643f8c395beba3be9 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 11 Jul 2025 13:02:51 -0700 Subject: [PATCH] cc-wrapper: fix including libstdcxx from GCC NG --- pkgs/build-support/cc-wrapper/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index a4b4573082f4..eecaacbd6fea 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -726,6 +726,15 @@ stdenvNoCC.mkDerivation { echo "-isystem ${getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags '' + # GCC NG friendly libc++ + + optionalString (libcxx != null && libcxx.isGNU or false) '' + for dir in ${getDev libcxx}/include/c++/*; do + echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags + done + for dir in ${getDev libcxx}/include/c++/*/${targetPlatform.config}; do + echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags + done + '' ## ## Initial CFLAGS