diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-19 22:51:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-19 22:51:00 -0500 |
| commit | 55757a0d44d11c051648ce03ecfb8881ff4e4dc5 (patch) | |
| tree | 1c31592eeec92e4d5e9e3877edeb72e4d95ec1a1 /pkgs/development/libraries/boehm-gc | |
| parent | d6d5795ed9dd0cf246a9fa25fb034164527a2ed8 (diff) | |
| parent | 30cda188e566bc7c00222ee11d99e8b987894028 (diff) | |
| download | nixpkgs-55757a0d44d11c051648ce03ecfb8881ff4e4dc5.tar nixpkgs-55757a0d44d11c051648ce03ecfb8881ff4e4dc5.tar.gz nixpkgs-55757a0d44d11c051648ce03ecfb8881ff4e4dc5.tar.bz2 nixpkgs-55757a0d44d11c051648ce03ecfb8881ff4e4dc5.tar.lz nixpkgs-55757a0d44d11c051648ce03ecfb8881ff4e4dc5.tar.xz nixpkgs-55757a0d44d11c051648ce03ecfb8881ff4e4dc5.tar.zst nixpkgs-55757a0d44d11c051648ce03ecfb8881ff4e4dc5.zip | |
Merge pull request #54402 from lopsided98/boehm-gc-cross-fix
beohm-gc: fix cross build of dependent packages
Diffstat (limited to 'pkgs/development/libraries/boehm-gc')
| -rw-r--r-- | pkgs/development/libraries/boehm-gc/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index c40fa044cfe..74cc80bf082 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; |