maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #49044 from akien-mga/3.x-linux-embree-unbundling-aarch64

Browse source 
Linux: Fix embree unbundling on aarch64
This commit is contained in:
Rémi Verschelde 2021-05-24 22:04:11 +02:00 committed by GitHub
parent 855406c882 752ed768fa
commit 130ecf0c9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
platform/x11/detect.py
View file

@ -310,10 +310,8 @@ def configure(env):
if not env["builtin_pcre2"]:
env.ParseConfig("pkg-config libpcre2-32 --cflags --libs")
# Embree is only compatible with x86_64. Yet another unreliable hack that will break
# cross-compilation, this will really need to be handle better. Thankfully only affects
# people who disable builtin_embree (likely distro packagers).
if env["tools"] and not env["builtin_embree"] and (is64 and platform.machine() == "x86_64"):
# Embree is only used in tools build on x86_64 and aarch64.
if env["tools"] and not env["builtin_embree"] and is64:
# No pkgconfig file so far, hardcode expected lib name.
env.Append(LIBS=["embree3"])