Merge #213021: build-support/cc-wrapper: add libstdc++fs

...into default library path for clang; merge into staging-next
2023-01-28 08:37:07 +01:00
parent 951b517e4c 4763533cca
commit 710d53b658
1 changed files with 5 additions and 0 deletions
@@ -321,6 +321,11 @@ stdenv.mkDerivation {
                      && !(stdenv.targetPlatform.useLLVM or false)
                      && gccForLibs != null) ''
      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
+
+      # Pull in 'cc.out' target to get 'libstdc++fs.a'. It should be in
+      # 'cc.lib'. But it's a gcc package bug.
+      # TODO(trofi): remove once gcc is fixed to move libraries to .lib output.
+      echo "-L${gccForLibs}/${optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"}/lib" >> $out/nix-support/cc-ldflags
    ''

    ##