From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Sat, 21 Jul 2012 10:43:06 +0000 (+0100)
Subject: autoconf: Only kink mcjit component when available.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bd9bf7a42473dfbdae4b61dd2556eba9529e9dd0;p=mesa.git

autoconf: Only kink mcjit component when available.

Should fix build failures with older LLVM version, but only tested on
LLVM 3.1.
---

diff --git a/configure.ac b/configure.ac
index 1d60957af5d..7b88331aeb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1847,10 +1847,14 @@ if test "x$enable_gallium_llvm" = xyes; then
 	    dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
 	    LLVM_LIBS="-lLLVM-`$LLVM_CONFIG --version`"
 	else
-	    LLVM_LIBS="`$LLVM_CONFIG --libs engine bitwriter mcjit`"
+            LLVM_COMPONENTS="engine bitwriter"
+            if $LLVM_CONFIG --components | grep -q '\<mcjit\>'; then
+                LLVM_COMPONENTS="${LLVM_COMPONENTS} mcjit"
+            fi
             if test "x$enable_opencl" = xyes; then
-                LLVM_LIBS="${LLVM_LIBS} `$LLVM_CONFIG --libs ipo linker instrumentation`"
+                LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo linker instrumentation"
             fi
+            LLVM_LIBS="`$LLVM_CONFIG --libs ${LLVM_COMPONENTS}`"
 	fi
 	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
 	LLVM_BINDIR=`$LLVM_CONFIG --bindir`