godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Rémi Verschelde 2024-01-16 18:17:05 +01:00
parent 62858097aa
commit ae34c85a87
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/denoise/config.py
View File

@ -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

2
modules/raycast/config.py
View File

@ -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":