diff options
| author | John Ericson <git@JohnEricson.me> | 2020-09-01 22:31:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 22:31:16 -0400 |
| commit | 1965a241fc2476ff63e8b97019a3db58707a8325 (patch) | |
| tree | 7e5efc37712cd6e72c85ee08a5b2a6965c3b4f6a /pkgs/servers/nosql | |
| parent | 54eacc77f7e8fd20db467f1363fee937ca8f5fa1 (diff) | |
| parent | c5fe132b3c5da5044c01a9bd4aa4ab45795cb9e6 (diff) | |
Merge pull request #61019 from volth/gcc.arch-amd
platform.gcc.arch: support for AMD CPUs
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/arangodb/default.nix | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 54d5e8484bcb9..4d5c24c730465 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/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; |