diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-09 16:38:35 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-09 16:38:35 +0200 |
| commit | d108b49168e25d87ac0dcdc707c6f830310543c5 (patch) | |
| tree | 1a51ee56a64ed1966a5920d4dde05c87989db6a0 /pkgs/development/libraries/science | |
| parent | acedc516fe6a561ff740976db3c1836a0aae9616 (diff) | |
| parent | 6e9f6a63a2d4fd30676b5e88696d3bf6104e843f (diff) | |
| download | nixlib-d108b49168e25d87ac0dcdc707c6f830310543c5.tar nixlib-d108b49168e25d87ac0dcdc707c6f830310543c5.tar.gz nixlib-d108b49168e25d87ac0dcdc707c6f830310543c5.tar.bz2 nixlib-d108b49168e25d87ac0dcdc707c6f830310543c5.tar.lz nixlib-d108b49168e25d87ac0dcdc707c6f830310543c5.tar.xz nixlib-d108b49168e25d87ac0dcdc707c6f830310543c5.tar.zst nixlib-d108b49168e25d87ac0dcdc707c6f830310543c5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/science')
| -rw-r--r-- | pkgs/development/libraries/science/math/openblas/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 2ae3bd2b9c83..5d0f6794d176 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -127,7 +127,12 @@ stdenv.mkDerivation rec { CROSS = stdenv.hostPlatform != stdenv.buildPlatform; HOSTCC = "cc"; # Makefile.system only checks defined status - NO_BINARY_MODE = toString (stdenv.hostPlatform != stdenv.buildPlatform); + # This seems to be a bug in the openblas Makefile: + # on x86_64 it expects NO_BINARY_MODE= + # but on aarch64 it expects NO_BINARY_MODE=0 + NO_BINARY_MODE = if stdenv.isx86_64 + then toString (stdenv.hostPlatform != stdenv.buildPlatform) + else stdenv.hostPlatform != stdenv.buildPlatform; }); doCheck = true; |