Merge pull request #61019 from volth/gcc.arch-amd

platform.gcc.arch: support for AMD CPUs
2020-09-01 22:31:16 -04:00
parent 54eacc77f7 c5fe132b3c
commit 1965a241fc
18 changed files with 168 additions and 95 deletions
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -2,7 +2,7 @@
 , guiSupport ? false, libX11

  # see http://dlib.net/compile.html
-, avxSupport ? true
+, avxSupport ? stdenv.hostPlatform.avxSupport
 , cudaSupport ? true
 }:

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
    rm -rf dlib/external
  '';

-  cmakeFlags = [ 
+  cmakeFlags = [
    "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}"
    "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ];