Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-08 20:09:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix build on X11 following 64-bit detection changes

Browse Source 
This also ports over the cross-compilation logic to the `server`
platform, and allows Embree to be used in server tools builds on aarch64.
This commit is contained in:
Hugo Locurcio 2024-02-06 01:24:11 +01:00 committed by Relintai
parent 6fa76aca7e
commit 19be158d88
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platform/server/detect.py
View File

@ -83,9 +83,17 @@ def configure(env):
## Architecture ## Architecture
is64 = sys.maxsize > 2 ** 32 # Cross-compilation
# TODO: Support cross-compilation on architectures other than x86.
host_is_64_bit = sys.maxsize > 2**32
if env["bits"] == "default": if env["bits"] == "default":
env["bits"] = "64" if is64 else "32" env["bits"] = "64" if host_is_64_bit else "32"
if host_is_64_bit and (env["bits"] == "32" or env["arch"] == "x86"):
env.Append(CCFLAGS=["-m32"])
env.Append(LINKFLAGS=["-m32"])
elif not host_is_64_bit and (env["bits"] == "64" or env["arch"] == "x86_64"):
env.Append(CCFLAGS=["-m64"])
env.Append(LINKFLAGS=["-m64"])
if env["arch"] == "" and platform.machine() == "riscv64": if env["arch"] == "" and platform.machine() == "riscv64":
env["arch"] = "rv64" env["arch"] = "rv64"