Use AC_PATH_TOOL instead of AC_PATH_PROG for llvm-config.
authorMichał Górny <mgorny@gentoo.org>
Sat, 28 Dec 2013 14:22:09 +0000 (15:22 +0100)
committerTom Stellard <thomas.stellard@amd.com>
Mon, 13 Jan 2014 22:37:55 +0000 (14:37 -0800)
This should help with cross-compiling and multilib when $CHOST-specific
llvm-config is expected rather than build host default one.

It will help us a bit in Gentoo where we've started using
i686-pc-linux-gnu-llvm-config for 32-bit multilib LLVM.

Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=73100
CC: "10.0" <mesa-stable@lists.freedesktop.org>
configure.ac

index 475bc6cb6a92d0c419d9556c1c713f4ce67e1646..4da6c51d36bbdecc55952f8b3de73bb7b124ee79 100644 (file)
@@ -1567,9 +1567,9 @@ if test "x$enable_gallium_llvm" = xauto; then
 fi
 if test "x$enable_gallium_llvm" = xyes; then
     if test "x$llvm_prefix" != x; then
-        AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"])
+        AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"])
     else
-        AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
+        AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no])
     fi
 
     if test "x$LLVM_CONFIG" != xno; then