pipe-loader: Use real galliumvl if radeonsi is being linked.
authorEric Anholt <eric@anholt.net>
Thu, 13 Aug 2020 23:13:08 +0000 (16:13 -0700)
committerMarge Bot <eric+marge@anholt.net>
Mon, 31 Aug 2020 17:50:30 +0000 (17:50 +0000)
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>

src/gallium/targets/pipe-loader/meson.build

index ecc00703641f2b08c3310c82e668ae5cd8c06e06..445289aa912ddd31ca47ae1be422a98b820fcae9 100644 (file)
@@ -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