Pārlūkot izejas kodu

Linux: Don't attempt linking embree3 on non-tools, link it for headless too

`tech_debt++`, that's what we get for not taking the time to cleanup all this
and do it right...

Follow-up to #48073 and #48102.

(cherry picked from commit a14b51df924cbdd915f46571b396d6b9ac6e84ff)
Rémi Verschelde 4 gadi atpakaļ
vecāks
revīzija
162c78f9dc
2 mainītis faili ar 8 papildinājumiem un 1 dzēšanām
  1. 7 0
      platform/server/detect.py
  2. 1 1
      platform/x11/detect.py

+ 7 - 0
platform/server/detect.py

@@ -222,6 +222,13 @@ 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"):
+        # No pkgconfig file so far, hardcode expected lib name.
+        env.Append(LIBS=["embree3"])
+
     ## Flags
 
     # Linkflags below this line should typically stay the last ones

+ 1 - 1
platform/x11/detect.py

@@ -313,7 +313,7 @@ def configure(env):
     # 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 not env["builtin_embree"] and (is64 and platform.machine() == "x86_64"):
+    if env["tools"] and not env["builtin_embree"] and (is64 and platform.machine() == "x86_64"):
         # No pkgconfig file so far, hardcode expected lib name.
         env.Append(LIBS=["embree3"])