gallium/targets: link against NIR when building radeonsi

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/drivers/radeonsi/Automake.inc b/src/gallium/drivers/radeonsi/Automake.inc
index 1bc7b93f8c3ecf47eb8adc719542ed057c83c6f2..6f1843a3c647b1c93eaf83045c32d837b6d73cc5 100644 (file)
--- a/src/gallium/drivers/radeonsi/Automake.inc
+++ b/src/gallium/drivers/radeonsi/Automake.inc
@@ -8,6 +8,9 @@ TARGET_LIB_DEPS += \
        $(LIBDRM_LIBS) \
        $(AMDGPU_LIBS)
 
+TARGET_COMPILER_LIB_DEPS = \
+       $(top_builddir)/src/compiler/nir/libnir.la
+
 TARGET_RADEON_WINSYS = \
        $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
        $(top_builddir)/src/gallium/winsys/amdgpu/drm/libamdgpuwinsys.la

diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am
index 7a783f43716af6ef03598897a681f6562b658a0e..8f2a6f5601eaea7da8521209dfe96ac84e680bed 100644 (file)
--- a/src/gallium/targets/d3dadapter9/Makefile.am
+++ b/src/gallium/targets/d3dadapter9/Makefile.am
@@ -103,6 +103,7 @@ d3dadapter9_la_LIBADD += \
        $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
        $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
        $(TARGET_LIB_DEPS) \
+       $(TARGET_COMPILER_LIB_DEPS) \
        $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
 
 else # HAVE_GALLIUM_STATIC_TARGETS

diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am
index 928e0182a661b7502472346b17899927421fa66b..d977255fcfcbfca2a679bac3899fe5138521234f 100644 (file)
--- a/src/gallium/targets/omx/Makefile.am
+++ b/src/gallium/targets/omx/Makefile.am
@@ -59,6 +59,7 @@ libomx_mesa_la_LIBADD += \
        $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
        $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
        $(TARGET_LIB_DEPS) \
+       $(TARGET_COMPILER_LIB_DEPS) \
        $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
 
 else # HAVE_GALLIUM_STATIC_TARGETS

diff --git a/src/gallium/targets/va/Makefile.am b/src/gallium/targets/va/Makefile.am
index 3fcc88e06c14b448fca21796a963863d3d2507d5..453a1c32541df8607934e10747d5bbe760412aa9 100644 (file)
--- a/src/gallium/targets/va/Makefile.am
+++ b/src/gallium/targets/va/Makefile.am
@@ -58,6 +58,7 @@ gallium_drv_video_la_LIBADD += \
        $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
        $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
        $(TARGET_LIB_DEPS) \
+       $(TARGET_COMPILER_LIB_DEPS) \
        $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
 
 else # HAVE_GALLIUM_STATIC_TARGETS

diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
index 26340f114a180b1f5293ae009cab5a61608738a9..c1cd59621e1f1114f416a0f4bb14f1c11f7ca399 100644 (file)
--- a/src/gallium/targets/vdpau/Makefile.am
+++ b/src/gallium/targets/vdpau/Makefile.am
@@ -64,6 +64,7 @@ libvdpau_gallium_la_LIBADD += \
        $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
        $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
        $(TARGET_LIB_DEPS) \
+       $(TARGET_COMPILER_LIB_DEPS) \
        $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
 
 else # HAVE_GALLIUM_STATIC_TARGETS

diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am
index 6937850adb9dee83c1250ddf6a1538f095874ef8..9f82d2605ede866572ac4410327b652cd4310436 100644 (file)
--- a/src/gallium/targets/xvmc/Makefile.am
+++ b/src/gallium/targets/xvmc/Makefile.am
@@ -53,6 +53,7 @@ libXvMCgallium_la_LIBADD += \
        $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
        $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
        $(TARGET_LIB_DEPS) \
+       $(TARGET_COMPILER_LIB_DEPS) \
        $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
 
 else # HAVE_GALLIUM_STATIC_TARGETS