summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets
diff options
context:
space:
mode:
authorJan Vesely <[email protected]>2019-04-01 12:00:22 -0400
committerJan Vesely <[email protected]>2019-04-10 14:52:52 -0400
commit460846981aa72c425bf0b772cba74f05e95e6050 (patch)
tree8a40602c48726cdb3b13a9d0ee542d37fa3d9b9f /src/gallium/targets
parentafad1f7d625d9402a0f7fe57287d536d7d9b4b5a (diff)
Partially revert "gallium: fix autotools build of pipe_msm.la"
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 <[email protected]> Acked-by: Dieter Nützel <[email protected]> Tested-by: Dieter Nützel <[email protected]> Tested-by: Vinson Lee <[email protected]>
Diffstat (limited to 'src/gallium/targets')
-rw-r--r--src/gallium/targets/pipe-loader/Makefile.am3
1 files changed, 2 insertions, 1 deletions
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 = \