diff options
| author | volth <volth@volth.com> | 2019-05-04 15:31:02 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2019-05-04 15:31:02 +0000 |
| commit | 091de095c92ab1d2932ec9dd5e810ea2575e2432 (patch) | |
| tree | 1c333d9ebf60550e78c9c70199a7b21baf6b4dbb /pkgs/development/libraries/gsl | |
| parent | 5a2356cff1816f8e05024f3e943f185a1288db19 (diff) | |
-mno-fma is x86_64 only; it hinders aarch64 compilation
Diffstat (limited to 'pkgs/development/libraries/gsl')
| -rw-r--r-- | pkgs/development/libraries/gsl/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/gsl/gsl-1_16.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 6e6b74d514e9..c8846509d004 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1395y9hlhqadn5g9j8q22224fds5sd92jxi9czfavjj24myasq04"; }; - NIX_CFLAGS_COMPILE = [ "-mno-fma" ]; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) + # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isx86_64 "-mno-fma"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux"; diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index 07dee287714a..e5772c8772ec 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; }; - NIX_CFLAGS_COMPILE = [ "-mno-fma" ]; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) + # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isx86_64 "-mno-fma"; patches = [ (fetchpatch { |