[Mesa-dev] [PATCH] Use probed $LLVM_CONFIG value instead of hard-coding it

Luca Tettamanti kronos.it at gmail.com
Wed Jun 27 13:56:38 PDT 2012


It makes it easier to use a non-default llvm-config binary.

Signed-off-by: Luca Tettamanti <kronos.it at gmail.com>
---
 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 46265a2..4572ee3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1866,7 +1866,7 @@ if test "x$enable_gallium_llvm" = xyes; then
 	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`"
+                LLVM_LIBS="${LLVM_LIBS} `$LLVM_CONFIG --libs ipo linker instrumentation`"
             fi
 	fi
 	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
@@ -2024,7 +2024,7 @@ if test "x$with_gallium_drivers" != x; then
                 USE_R600_LLVM_COMPILER=yes;
             fi
             if test "x$enable_opencl" = xyes -a "x$with_llvm_shared_libs" = xno; then
-                LLVM_LIBS="${LLVM_LIBS} `llvm-config --libs bitreader asmparser`"
+                LLVM_LIBS="${LLVM_LIBS} `$LLVM_CONFIG --libs bitreader asmparser`"
             fi
             gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600" "va-r600"
             ;;
-- 
1.7.10



More information about the mesa-dev mailing list