From bd9bf7a42473dfbdae4b61dd2556eba9529e9dd0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Sat, 21 Jul 2012 11:43:06 +0100 Subject: [PATCH] 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 file changed, 6 insertions(+), 2 deletions(-) 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 '\'; 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` -- 2.30.2