From: Vinson Lee Date: Sat, 30 Mar 2019 06:24:05 +0000 (-0700) Subject: gallium: Fix autotools build with libxatracker.la. X-Git-Tag: android-x86-9.0-r1~7787 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e757a2481f7076e98e776e18c1ecda7062ee8504;p=android-x86%2Fexternal-mesa.git gallium: Fix autotools build with libxatracker.la. CXXLD libxatracker.la /usr/bin/ld: ../../../../src/gallium/auxiliary/.libs/libgallium.a(tgsi_to_nir.o): in function `ttn_finalize_nir': src/gallium/auxiliary/nir/tgsi_to_nir.c:2111: undefined reference to `gl_nir_lower_samplers_as_deref' /usr/bin/ld: src/gallium/auxiliary/nir/tgsi_to_nir.c:2113: undefined reference to `gl_nir_lower_samplers' Fixes: 9a834447d652 ("tgsi_to_nir: Produce optimized NIR for a given pipe_screen.") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109929 Signed-off-by: Vinson Lee --- diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index 7b0e9006e06..2238a7ea81f 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -37,16 +37,14 @@ libxatracker_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/xa/libxatracker.la \ $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/compiler/nir/libnir.la \ - $(top_builddir)/src/util/libmesautil.la \ + $(top_builddir)/src/compiler/glsl/libglsl.la \ $(LIBDRM_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) libxatracker_la_LDFLAGS = \ -no-undefined \ -version-number $(XA_MAJOR):$(XA_MINOR):$(XA_PATCH) \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) + $(GC_SECTIONS) if HAVE_LD_VERSION_SCRIPT libxatracker_la_LDFLAGS += \