Mesa (master): vc4: Fix automake linking error.

[GitLab Mirror]

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

Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Tue Jul 31 14:17:23 2018 +0200

vc4: Fix automake linking error.

  CXXLD    gallium_dri.la
../../../../src/gallium/drivers/vc4/.libs/libvc4.a(vc4_cl_dump.o): In function `vc4_dump_cl':
src/gallium/drivers/vc4/vc4_cl_dump.c:45: undefined reference to `clif_dump_init'
src/gallium/drivers/vc4/vc4_cl_dump.c:82: undefined reference to `clif_dump_destroy'
../../../../src/broadcom/cle/.libs/libbroadcom_cle.a(cle_libbroadcom_cle_la-v3d_decoder.o): In function `v3d_field_iterator_next':
src/broadcom/cle/v3d_decoder.c:902: undefined reference to `clif_lookup_bo'

Fixes: e92959c4e0 ("v3d: Pass the whole clif_dump structure to v3d_print_group().")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107423
CC: Eric Anholt <eric at anholt.net>
Acked-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Andres Gomez <agomez at igalia.com>

---

 src/gallium/drivers/vc4/Automake.inc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/gallium/drivers/vc4/Automake.inc b/src/gallium/drivers/vc4/Automake.inc
index b1aa9726bd..650466e495 100644
--- a/src/gallium/drivers/vc4/Automake.inc
+++ b/src/gallium/drivers/vc4/Automake.inc
@@ -2,9 +2,18 @@ if HAVE_GALLIUM_VC4
 
 TARGET_DRIVERS += vc4
 TARGET_CPPFLAGS += -DGALLIUM_VC4
+
+if !HAVE_GALLIUM_V3D
+TARGET_LIB_DEPS += \
+	$(top_builddir)/src/broadcom/libbroadcom.la \
+	$(top_builddir)/src/broadcom/libbroadcom_v33.la \
+	$(top_builddir)/src/broadcom/libbroadcom_v41.la
+endif
+
 TARGET_LIB_DEPS += \
 	$(top_builddir)/src/gallium/winsys/vc4/drm/libvc4drm.la \
 	$(top_builddir)/src/gallium/drivers/vc4/libvc4.la \
 	$(top_builddir)/src/broadcom/cle/libbroadcom_cle.la
 
+
 endif