Merge pull request #311751 from risicle/ris-libaom-runtime-cpu-detection-aarch64-darwin

libaom: don't disable runtime cpu detection on aarch64-darwin
2024-05-15 15:00:23 +02:00
parent ef850861bc 4d045a7de8
commit 2a949a0095
1 changed files with 0 additions and 3 deletions
@@ -47,9 +47,6 @@ stdenv.mkDerivation rec {
    "-DENABLE_TESTS=OFF"
  ] ++ lib.optionals enableVmaf [
    "-DCONFIG_TUNE_VMAF=1"
-  ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
-    # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build:
-    "-DCONFIG_RUNTIME_CPU_DETECT=0"
  ] ++ lib.optionals (isCross && !stdenv.hostPlatform.isx86) [
    "-DCMAKE_ASM_COMPILER=${stdenv.cc.targetPrefix}as"
  ] ++ lib.optionals stdenv.isAarch32 [