asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCons: Work around compilation issue on Linux ARM64

Browse source 
Fixes #45687.

This is really just a band-aid, our current buildsystem doesn't work well for
cross-compilation and needs a thorough refactoring to do so.
This commit is contained in:
Rémi Verschelde 2021-02-23 13:48:57 +01:00
parent acb92783c4
commit 6b2cfa416c
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/denoise/config.py
View file

@ -8,6 +8,15 @@ def can_build(env, platform):
supported_platform = platform in ["x11", "osx", "windows", "server"] supported_platform = platform in ["x11", "osx", "windows", "server"]
supported_bits = env["bits"] == "64" supported_bits = env["bits"] == "64"
supported_arch = env["arch"] != "arm64" supported_arch = env["arch"] != "arm64"
# Hack to disable on Linux arm64. This won't work well for cross-compilation (checks
# host, not target) and would need a more thorough fix by refactoring our arch and
# bits-handling code.
from platform import machine
if platform == "x11" and machine() != "x86_64":
supported_arch = False
return env["tools"] and supported_platform and supported_bits and supported_arch return env["tools"] and supported_platform and supported_bits and supported_arch

9
modules/raycast/config.py
View file

@ -6,6 +6,15 @@ def can_build(env, platform):
supported_platform = platform in ["x11", "osx", "windows", "server"] supported_platform = platform in ["x11", "osx", "windows", "server"]
supported_bits = env["bits"] == "64" supported_bits = env["bits"] == "64"
supported_arch = env["arch"] != "arm64" supported_arch = env["arch"] != "arm64"
# Hack to disable on Linux arm64. This won't work well for cross-compilation (checks
# host, not target) and would need a more thorough fix by refactoring our arch and
# bits-handling code.
from platform import machine
if platform == "x11" and machine() != "x86_64":
supported_arch = False
return env["tools"] and supported_platform and supported_bits and supported_arch return env["tools"] and supported_platform and supported_bits and supported_arch