From ae34c85a875f7a62f2cd1ada438355c9f6906362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 16 Jan 2024 18:17:05 +0100 Subject: [PATCH] Linux: Fix arm32 build for OIDN and Embree Still paying the cost of not having refactored all architecture handling in the 3.x branch so we have this broken hybrid of arch/bits which is unreliable. --- modules/denoise/config.py | 2 +- modules/raycast/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/denoise/config.py b/modules/denoise/config.py index 84f31204254..b2c95de0480 100644 --- a/modules/denoise/config.py +++ b/modules/denoise/config.py @@ -7,7 +7,7 @@ def can_build(env, platform): # Note: oneDNN doesn't support ARM64, OIDN needs updating to the latest version supported_platform = platform in ["x11", "osx", "windows", "server"] supported_arch = env["bits"] == "64" - if env["arch"] == "arm64": + if env["arch"].startswith("arm"): supported_arch = False if env["arch"].startswith("ppc"): supported_arch = False diff --git a/modules/raycast/config.py b/modules/raycast/config.py index 3bad13f479a..7ae183d13a9 100644 --- a/modules/raycast/config.py +++ b/modules/raycast/config.py @@ -3,7 +3,7 @@ def can_build(env, platform): return False # Depends on Embree library, which only supports x86_64 and aarch64. - if env["arch"].startswith("rv") or env["arch"].startswith("ppc"): + if env["arch"] in ["arm", "arm32"] or env["arch"].startswith("rv") or env["arch"].startswith("ppc"): return False if platform == "android":