talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

cc-wrapper: fix including libstdcxx from GCC NG

Browse Source
This commit is contained in:
Tristan Ross 2025-07-11 13:02:51 -07:00
parent dffc946786
commit 6b03c5677a
No known key found for this signature in database
GPG Key ID: B09C422035669AF8
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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