public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #54402 from lopsided98/boehm-gc-cross-fix 

beohm-gc: fix cross build of dependent packages
This commit is contained in:
Matthew Bauer 2019-02-19 22:51:00 -05:00 committed by GitHub
parent d6d5795ed9 30cda188e5
commit 55757a0d44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/boehm-gc/default.nix
View File

@ -35,7 +35,12 @@ stdenv.mkDerivation rec {
configureFlags = configureFlags =
[ "--enable-cplusplus" ] [ "--enable-cplusplus" ]
++ lib.optional enableLargeConfig "--enable-large-config" ++ 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; doCheck = true; # not cross;