clover: Link to the necessary LLVM and Clang libs

diff --git a/configure.ac b/configure.ac
index 07b64830d761e9abdc55d5ee93677a3dddc9a28f..db68a87f0070438c221d0ebcad93036d77a161fd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1854,6 +1854,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 0d233c11b8d99538bf444f0eea5e8cf5d36b3f6b..d55b21ed8c8a961b605b06dd5b05673a66ac00ae 100644 (file)
--- 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 =