Skip to content

Commit

Permalink
haskell-modules: cope with !(stdenv.cc.libcxx?cxxabi)
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Joseph committed Jan 20, 2024
1 parent ad34020 commit eca13b3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/generic-builder.nix
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ stdenv.mkDerivation ({
# Ensure libc++abi is linked even when clang is invoked as just `clang` or `cc`.
# Works around https://github.com/NixOS/nixpkgs/issues/166205.
# This can be dropped once a fix has been committed to cc-wrapper.
// lib.optionalAttrs (stdenv.hasCC && stdenv.cc.isClang && stdenv.cc.libcxx != null) {
// lib.optionalAttrs (stdenv.hasCC && stdenv.cc.isClang && stdenv.cc.libcxx != null && stdenv.cc.libcxx?cxxabi.libName) {
NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
}
)
Expand Down

0 comments on commit eca13b3

Please sign in to comment.