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/servers | |
| 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/servers')
| -rw-r--r-- | nixpkgs/pkgs/servers/nosql/arangodb/default.nix | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/servers/nosql/arangodb/default.nix b/nixpkgs/pkgs/servers/nosql/arangodb/default.nix index 54d5e8484bcb..4d5c24c73046 100644 --- a/nixpkgs/pkgs/servers/nosql/arangodb/default.nix +++ b/nixpkgs/pkgs/servers/nosql/arangodb/default.nix @@ -32,15 +32,9 @@ let # do not set GCC's -march=xxx based on builder's /proc/cpuinfo "-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF" # also avoid using builder's /proc/cpuinfo - ] ++ - { westmere = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - sandybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - ivybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - haswell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - broadwell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - skylake = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - skylake-avx512 = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ]; + "-DHAVE_SSE42=${if stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" + "-DASM_OPTIMIZATIONS=${if stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" + ]; enableParallelBuilding = true; |