[Mesa-dev] [PATCH 07/11] clover: Link to the necessary LLVM and Clang libs

[Tom Stellard]

---
 configure.ac                           |    3 +++
 src/gallium/targets/opencl/Makefile.am |   18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9c7f54b..c4c9eca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1846,6 +1846,9 @@ if test "x$enable_gallium_llvm" = xyes; then
 	    LLVM_LIBS="-lLLVM-`$LLVM_CONFIG --version`"
 	else
 	    LLVM_LIBS="`$LLVM_CONFIG --libs engine bitwriter`"
+            if test "x$enable_opencl" = xyes; then
+                LLVM_LIBS="${LLVM_LIBS} `llvm-config --libs ipo linker instrumentation`"
+            fi
 	fi
 	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
 	LLVM_BINDIR=`$LLVM_CONFIG --bindir`
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index 0d233c1..d55b21e 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -9,7 +9,23 @@ libOpenCL_la_LIBADD = \
 	$(top_builddir)/src/gallium/state_trackers/clover/libclover.la \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.a \
 	$(GALLIUM_PIPE_LOADER_LIBS) $(LIBUDEV_LIBS) \
-	-ldl
+	-ldl \
+	-lclangCodeGen \
+	-lclangFrontendTool \
+	-lclangFrontend \
+	-lclangDriver \
+	-lclangSerialization \
+	-lclangCodeGen \
+	-lclangParse \
+	-lclangSema \
+	-lclangAnalysis \
+	-lclangRewrite \
+	-lclangAST \
+	-lclangLex \
+	-lclangBasic \
+	-lclangEdit \
+	$(LLVM_LIBS)
+
 
 libOpenCL_la_SOURCES =
 
-- 
1.7.3.4