From: Eric Anholt <eric@anholt.net>
Date: Thu, 13 Aug 2020 23:13:08 +0000 (-0700)
Subject: pipe-loader: Use real galliumvl if radeonsi is being linked.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8c4fb19f0963c5b831bb854f92818342542ada30;p=mesa.git

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@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6324>
---

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