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

fftw: Re-enable OpenMP with non-GCC and musl.

Browse Source 
Clang now supports OpenMP, and musl has no problem with it either.

Related to #7023 and #34645.

See also #79818.
This commit is contained in:
Niklas Hambüchen 2020-02-11 11:53:54 +01:00
parent 19ff097181
commit a72367ae31
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/fftw/default.nix
View File

@ -1,7 +1,8 @@
{ fetchurl, stdenv, lib, precision ? "double", perl }: { fetchurl, stdenv, lib, llvmPackages ? null, precision ? "double", perl }:
with lib; with lib;
assert stdenv.cc.isClang -> llvmPackages != null;
assert elem precision [ "single" "double" "long-double" "quad-precision" ]; assert elem precision [ "single" "double" "long-double" "quad-precision" ];
let let
@ -24,6 +25,11 @@ stdenv.mkDerivation {
++ optional withDoc "info"; # it's dev-doc only ++ optional withDoc "info"; # it's dev-doc only
outputBin = "dev"; # fftw-wisdom outputBin = "dev"; # fftw-wisdom
buildInputs = lib.optionals stdenv.cc.isClang [
# TODO: This may mismatch the LLVM version sin the stdenv, see #79818.
llvmPackages.openmp
];
configureFlags = configureFlags =
[ "--enable-shared" [ "--enable-shared"
"--enable-threads" "--enable-threads"
@ -32,7 +38,7 @@ stdenv.mkDerivation {
# all x86_64 have sse2 # all x86_64 have sse2
# however, not all float sizes fit # however, not all float sizes fit
++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2" ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2"
++ optional (stdenv.cc.isGNU && !stdenv.hostPlatform.isMusl) "--enable-openmp" ++ [ "--enable-openmp" ]
# doc generation causes Fortran wrapper generation which hard-codes gcc # doc generation causes Fortran wrapper generation which hard-codes gcc
++ optional (!withDoc) "--disable-doc"; ++ optional (!withDoc) "--disable-doc";