Merge branch 'master' into avoid-error-for-empty-include-dirs

ryanrasti · Jun 10, 2022 · 4a50c40 · 4a50c40
2 parents 2c92ed7 + 946def9
commit 4a50c40
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/toolchains/cc/cc.nix b/toolchains/cc/cc.nix
@@ -41,6 +41,12 @@ let
         echo "-L${pkgs.llvmPackages.libcxxabi}/lib" >> $out/nix-support/cc-cflags
         echo "-L${pkgs.libiconv}/lib" >> $out/nix-support/cc-cflags
         echo "-L${pkgs.darwin.libobjc}/lib" >> $out/nix-support/cc-cflags
+
+        # avoid linker warning about non-existent directory
+        # > ld: warning: directory not found for option '-L/nix/store/gsfxxazc51sx6vjdrz6cq8s19x7h5mwh-clang-wrapper-7.1.0/lib'
+        if ! [[ -d '${pkgs.lib.getLib cc}/lib' ]]; then
+          sed -i -e 's%-L${pkgs.lib.getLib cc}/lib\($\| \)%%' $out/nix-support/cc-ldflags
+        fi
       '';
     };
   cc =