Merge pull request #145854 from flurie/fix-blitz-darwin

blitz: fix build for darwin
This commit is contained in:
Dmitry Kalinkin 2021-11-14 23:36:15 -05:00 committed by GitHub
commit b83e188dfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,13 +1,20 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, gfortran, texinfo, python, boost { stdenv
# Select SIMD alignment width (in bytes) for vectorization. , lib
, fetchFromGitHub
, pkg-config
, gfortran
, texinfo
, python
, boost
# Select SIMD alignment width (in bytes) for vectorization.
, simdWidth ? 1 , simdWidth ? 1
# Pad arrays to simdWidth by default? # Pad arrays to simdWidth by default?
# Note: Only useful if simdWidth > 1 # Note: Only useful if simdWidth > 1
, enablePadding ? false , enablePadding ? false
# Activate serialization through Boost.Serialize? # Activate serialization through Boost.Serialize?
, enableSerialization ? true , enableSerialization ? true
# Activate test-suite? # Activate test-suite?
# WARNING: Some of the tests require up to 1700MB of memory to compile. # WARNING: Some of the tests require up to 1700MB of memory to compile.
, doCheck ? true , doCheck ? true
}: }:
@ -29,7 +36,8 @@ stdenv.mkDerivation rec {
buildInputs = [ gfortran texinfo boost ]; buildInputs = [ gfortran texinfo boost ];
configureFlags = configureFlags =
[ "--enable-shared" [
"--enable-shared"
"--disable-static" "--disable-static"
"--enable-fortran" "--enable-fortran"
"--enable-optimize" "--enable-optimize"
@ -45,6 +53,9 @@ stdenv.mkDerivation rec {
++ optional enableSerialization "--enable-serialization" ++ optional enableSerialization "--enable-serialization"
++ optional stdenv.is64bit "--enable-64bit"; ++ optional stdenv.is64bit "--enable-64bit";
# skip broken library name detection
ax_boost_user_serialization_lib = lib.optionalString stdenv.isDarwin "boost_serialization";
enableParallelBuilding = true; enableParallelBuilding = true;
inherit doCheck; inherit doCheck;