diff options
| author | volth <volth@volth.com> | 2020-08-05 02:32:41 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:28:22 +0000 |
| commit | bc030c028322c3797c351832ff2e41348351a223 (patch) | |
| tree | 1338ec7ecc4c5d9941b419b1b83fe164e261f1b9 /nixpkgs/pkgs/development/libraries/givaro | |
| parent | 56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600 (diff) | |
| download | nixlib-bc030c028322c3797c351832ff2e41348351a223.tar nixlib-bc030c028322c3797c351832ff2e41348351a223.tar.gz nixlib-bc030c028322c3797c351832ff2e41348351a223.tar.bz2 nixlib-bc030c028322c3797c351832ff2e41348351a223.tar.lz nixlib-bc030c028322c3797c351832ff2e41348351a223.tar.xz nixlib-bc030c028322c3797c351832ff2e41348351a223.tar.zst nixlib-bc030c028322c3797c351832ff2e41348351a223.zip | |
gcc.arch: refactor, move tables under lib/
(cherry picked from commit cf7b63df5b9efdef4e8e1b3261d7040199f7e671)
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/givaro')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/givaro/default.nix | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/development/libraries/givaro/default.nix b/nixpkgs/pkgs/development/libraries/givaro/default.nix index b88d63c3d7e4..78b6b0882707 100644 --- a/nixpkgs/pkgs/development/libraries/givaro/default.nix +++ b/nixpkgs/pkgs/development/libraries/givaro/default.nix @@ -17,26 +17,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-optimization" - ] ++ stdenv.lib.optionals stdenv.isx86_64 { + ] ++ stdenv.lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) - default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - # Intel - westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - haswell = [ "--disable-fma4" ]; - broadwell = [ "--disable-fma4" ]; - skylake = [ "--disable-fma4" ]; - skylake-avx512 = [ "--disable-fma4" ]; - # AMD - btver1 = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - btver2 = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - bdver1 = [ "--disable-avx2" ]; - bdver2 = [ "--disable-avx2" ]; - bdver3 = [ "--disable-avx2" ]; - bdver4 = [ ]; - znver1 = [ "--disable-fma4" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; + "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" + "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" + "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41" + "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42" + "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx" + "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" + "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" + "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" + ]; # On darwin, tests are linked to dylib in the nix store, so we need to make # sure tests run after installPhase. |