From 30cda188e566bc7c00222ee11d99e8b987894028 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 20 Jan 2019 23:01:11 -0500 Subject: boehm-gc: don't link to libatomic_ops when cross-compiling The 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 atomic intrinsics are available. --- pkgs/development/libraries/boehm-gc/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/boehm-gc/default.nix') diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index cdf72830797..a7e593d6795 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -35,7 +35,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-cplusplus" ] ++ lib.optional enableLargeConfig "--enable-large-config" - ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static"; + ++ 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"; doCheck = true; # not cross; -- cgit 1.4.1