From 460846981aa72c425bf0b772cba74f05e95e6050 Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Mon, 1 Apr 2019 12:00:22 -0400 Subject: [PATCH] Partially revert "gallium: fix autotools build of pipe_msm.la" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This partially reverts commit 356ec7a21960d77db282f67af577dcdb46966b5a. There are symbols needed by libglsl missing, so we might as well skip the entire library. Fixes: 356ec7a21960d77db282f67af577dcdb46966b5a Signed-off-by: Jan Vesely Acked-by: Dieter Nützel Tested-by: Dieter Nützel Tested-by: Vinson Lee --- src/gallium/targets/pipe-loader/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index 807a100a7d0..864ee8d50d3 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -53,7 +53,8 @@ endif PIPE_LIBS += \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/compiler/glsl/libglsl.la \ + $(top_builddir)/src/compiler/nir/libnir.la \ + $(top_builddir)/src/util/libmesautil.la \ $(GALLIUM_COMMON_LIB_DEPS) AM_LDFLAGS = \ -- 2.30.2