Mesa (master): freedreno: Fix the Makefile.am fix

[GitLab Mirror]

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

Author: Kristian H. Kristensen <hoegsberg at chromium.org>
Date:   Mon Dec 10 14:22:47 2018 -0800

freedreno: Fix the Makefile.am fix

Commit b028ce29f090938d12b0999fe4b0e712d2adc431 fixed a typo in
src/freedreno/Makefile.am, but ended up breaking the build for
freedreno.  The typo inadvertently made things work, as we were not
supposed to link with libnir or libmesautil to begin with.  Those come
in through libmesagallium and the typo prevented the duplicated
linkage.

Fixes: b028ce29f ("freedreno: add the missing _la in libfreedreno_ir3_la")
Cc: Emil Velikov <emil.velikov at collabora.com>

---

 src/freedreno/Makefile.am | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/freedreno/Makefile.am b/src/freedreno/Makefile.am
index 12678c08f3..ff104cf147 100644
--- a/src/freedreno/Makefile.am
+++ b/src/freedreno/Makefile.am
@@ -65,9 +65,6 @@ libfreedreno_ir3_la_CFLAGS = \
 	-I$(top_srcdir)/src/freedreno/ir3 \
 	-I$(top_builddir)/src/compiler/nir \
 	-I$(top_srcdir)/src/compiler/nir
-libfreedreno_ir3_la_LIBADD = \
-	$(top_builddir)/src/compiler/nir/libnir.la \
-	$(top_builddir)/src/util/libmesautil.la
 
 ir3/ir3_nir_trig.c: ir3/ir3_nir_trig.py $(top_srcdir)/src/compiler/nir/nir_algebraic.py
 	$(MKDIR_GEN)