1
0
mirror of https://github.com/godotengine/godot.git synced 2025-12-01 16:38:31 +00:00

Fix build on X11 following 64-bit detection changes

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
parent a81d96c637
commit b859a1898d
2 changed files with 13 additions and 7 deletions

View File

@@ -358,7 +358,7 @@ def configure(env):
env.ParseConfig("pkg-config libpcre2-32 --cflags --libs")
# Embree is only used in tools build on x86_64 and aarch64.
if env["tools"] and not env["builtin_embree"] and is64:
if env["tools"] and not env["builtin_embree"] and host_is_64_bit:
# No pkgconfig file so far, hardcode expected lib name.
env.Append(LIBS=["embree3"])