mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 14:41:17 +00:00
boehm-gc: remove libatomic_ops build input
This commit is contained in:
parent
26e907886c
commit
7c11742f85
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops
|
||||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179
|
||||
}:
|
||||
|
||||
|
@ -14,9 +14,6 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3";
|
||||
};
|
||||
|
||||
buildInputs = [ libatomic_ops ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
separateDebugInfo = stdenv.isLinux;
|
||||
|
||||
|
@ -29,14 +26,9 @@ stdenv.mkDerivation rec {
|
|||
lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-cplusplus" ]
|
||||
[ "--enable-cplusplus" "--with-libatomic-ops=none" ]
|
||||
++ lib.optional enableLargeConfig "--enable-large-config"
|
||||
++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static"
|
||||
# Configure script can't detect whether C11 atomic intrinsics are available
|
||||
# when cross-compiling, so it links to libatomic_ops, which has to be
|
||||
# propagated to all dependencies. To avoid this, assume that the intrinsics
|
||||
# are available.
|
||||
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-libatomic-ops=none";
|
||||
++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static";
|
||||
|
||||
doCheck = true; # not cross;
|
||||
|
||||
|
|
Loading…
Reference in a new issue