From 752ed768fa00841a5b7be8592fd34f4c283802c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 24 May 2021 21:10:43 +0200 Subject: [PATCH] Linux: Fix embree unbundling on aarch64 Embree supports aarch64 since version 3.13.0. --- platform/x11/detect.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 3b7eacd8ca..542223ef96 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -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"])