Mesa (master): clover: Fix linkage of libOpenCL

Tom Stellard tstellar at kemper.freedesktop.org
Mon Apr 8 14:52:06 UTC 2013


Module: Mesa
Branch: master
Commit: b336f51cc72a3290b39ead5c76ca36156562c0bd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b336f51cc72a3290b39ead5c76ca36156562c0bd

Author: Niels Ole Salscheider <niels_ole at salscheider-online.de>
Date:   Thu Apr  4 23:26:45 2013 +0200

clover: Fix linkage of libOpenCL

Clover needs the irreader component of llvm

v2: Check for irreader component
irreader is only available with LLVM 3.3 >= 177971

Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
Signed-off-by: Niels Ole Salscheider <niels_ole at salscheider-online.de>

---

 configure.ac |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 81d4a3f..fea5868 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1650,6 +1650,10 @@ if test "x$enable_gallium_llvm" = xyes; then
 
         if test "x$enable_opencl" = xyes; then
             LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo linker instrumentation"
+            # LLVM 3.3 >= 177971 requires IRReader
+            if $LLVM_CONFIG --components | grep -q '\<irreader\>'; then
+                LLVM_COMPONENTS="${LLVM_COMPONENTS} irreader"
+            fi
         fi
 	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
 	LLVM_BINDIR=`$LLVM_CONFIG --bindir`




More information about the mesa-commit mailing list