From 6423004d851bfc33aeb980548b877c1501a6e3a9 Mon Sep 17 00:00:00 2001 From: Tim Rowley Date: Mon, 16 May 2016 13:31:16 -0500 Subject: [PATCH] swr: fix swr linkage so that static llvm works Reviewed-by: Emil Velikov --- src/gallium/drivers/swr/Makefile.am | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am index 6915aae356c..0a5ff19a74c 100644 --- a/src/gallium/drivers/swr/Makefile.am +++ b/src/gallium/drivers/swr/Makefile.am @@ -102,7 +102,10 @@ rasterizer/jitter/builder_x86.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros. COMMON_LIBADD = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/mesa/libmesagallium.la + $(top_builddir)/src/mesa/libmesagallium.la \ + $(LLVM_LIBS) + +COMMON_LDFLAGS = $(LLVM_LDFLAGS) lib_LTLIBRARIES = libswrAVX.la libswrAVX2.la @@ -117,6 +120,9 @@ libswrAVX_la_SOURCES = \ libswrAVX_la_LIBADD = \ $(COMMON_LIBADD) +libswrAVX_la_LDFLAGS = \ + $(COMMON_LDFLAGS) + libswrAVX2_la_CXXFLAGS = \ -march=core-avx2 \ -DKNOB_ARCH=KNOB_ARCH_AVX2 \ @@ -128,4 +134,7 @@ libswrAVX2_la_SOURCES = \ libswrAVX2_la_LIBADD = \ $(COMMON_LIBADD) +libswrAVX2_la_LDFLAGS = \ + $(COMMON_LDFLAGS) + include $(top_srcdir)/install-gallium-links.mk -- 2.30.2