Mesa (master): pipe-loader: Use real galliumvl if radeonsi is being linked.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 8c4fb19f0963c5b831bb854f92818342542ada30
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c4fb19f0963c5b831bb854f92818342542ada30

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Aug 13 16:13:08 2020 -0700

pipe-loader: Use real galliumvl if radeonsi is being linked.

When switching to lld, I saw errors from multiply defined vl symbols due to
radeonsi always linking libgalliumvl.

Acked-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6324>

---

 src/gallium/targets/pipe-loader/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build
index ecc00703641..445289aa912 100644
--- a/src/gallium/targets/pipe-loader/meson.build
+++ b/src/gallium/targets/pipe-loader/meson.build
@@ -28,7 +28,7 @@ pipe_loader_incs = [
 ]
 
 if (with_gallium_va or with_gallium_vdpau or with_gallium_omx != 'disabled' or
-    with_gallium_xvmc or with_dri)
+    with_gallium_xvmc or with_dri or with_gallium_radeonsi)
   pipe_loader_link_with += libgalliumvl
 else
   pipe_loader_link_with += libgalliumvl_stub