Merge pull request #59069 from delroth/nilfs-utils-cross

nilfs-utils: fix cross-compilation issue caused by AC_FUNC_MALLOC
This commit is contained in:
Matthew Bauer 2019-04-07 17:53:52 -04:00 committed by GitHub
commit 6eb0e1a2a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -35,7 +35,13 @@ stdenv.mkDerivation rec {
})
];
configureFlags = [ "--with-libmount" ];
configureFlags = [
"--with-libmount"
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# AC_FUNC_MALLOC is broken on cross builds.
"ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes"
];
# FIXME: https://github.com/NixOS/patchelf/pull/98 is in, but stdenv
# still doesn't use it