Merge #206230: x265: only disable assembly on riscv-cross builds

...into staging
2022-12-16 11:21:59 +01:00
parent 59a68f487d fde44ef915
commit cb835f1071
1 changed files with 1 additions and 2 deletions
@@ -35,8 +35,7 @@ let
    (mkFlag vtuneSupport "ENABLE_VTUNE")
    (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
    # Potentially riscv cross could be fixed by providing the correct CMAKE_SYSTEM_PROCESSOR flag
-    (mkFlag (with stdenv; !(isCross && hostPlatform.isRiscV || isDarwin && isAarch64)) "ENABLE_ASSEMBLY")
-  ];
+  ] ++ lib.optional (isCross && stdenv.hostPlatform.isRiscV) "-DENABLE_ASSEMBLY=OFF";

  cmakeStaticLibFlags = [
    "-DHIGH_BIT_DEPTH=ON"