mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-04 03:03:42 +00:00
Merge pull request #270605 from a-n-n-a-l-e-e/libserdes-c++-abi
libserdes: link with libc++ libc++abi; fix darwin build
This commit is contained in:
commit
7762e14532
@ -39,6 +39,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs configure lds-gen.pl
|
||||
'' + lib.optionalString (stdenv.cc.libcxx != null) ''
|
||||
# fix for https://github.com/NixOS/nixpkgs/issues/166205
|
||||
# llvm12+ isn't adding libc++abi
|
||||
substituteInPlace src-cpp/Makefile \
|
||||
--replace "LIBS += -lstdc++" "LIBS += -lc++ -l${stdenv.cc.libcxx.cxxabi.libName}"
|
||||
'';
|
||||
|
||||
# Has a configure script but it’s not Autoconf so steal some bits from multiple-outputs.sh:
|
||||
|
Loading…
Reference in New Issue
Block a user