Mesa (master): autoconf: Only kink mcjit component when available.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Sat Jul 21 10:41:06 UTC 2012
Module: Mesa
Branch: master
Commit: bd9bf7a42473dfbdae4b61dd2556eba9529e9dd0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bd9bf7a42473dfbdae4b61dd2556eba9529e9dd0
Author: José Fonseca <jose.r.fonseca at gmail.com>
Date: Sat Jul 21 11:43:06 2012 +0100
autoconf: Only kink mcjit component when available.
Should fix build failures with older LLVM version, but only tested on
LLVM 3.1.
---
configure.ac | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1d60957..7b88331 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`
More information about the mesa-commit
mailing list