Unverified Commit 754ada3a authored by toonn's avatar toonn Committed by GitHub
Browse files

Merge pull request #262659 from reckenrode/crystal-fix 

crystal: fix build with newer versions of clang
parents e437fe25 2ce46f4f

pkgs/development/compilers/crystal/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -148,6 +148,11 @@ let 
        # See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277

        substituteInPlace spec/compiler/loader/unix_spec.cr \

          --replace 'it "parses file paths"' 'pending "parses file paths"'

      '' + lib.optionalString (stdenv.cc.isClang && (stdenv.cc.libcxx != null)) ''

        # Darwin links against libc++ not libstdc++. Newer versions of clang (12+) require

        # libc++abi to be linked explicitly (see https://github.com/NixOS/nixpkgs/issues/166205).

        substituteInPlace src/llvm/lib_llvm.cr \

          --replace '@[Link("stdc++")]' '@[Link("c++", "-l${stdenv.cc.libcxx.cxxabi.libName}")]'

      '';



      # Defaults are 4