From 2350387d24d6f2470450ee9e78792a9ee957034b Mon Sep 17 00:00:00 2001 From: Tobias Droste Date: Sat, 19 Nov 2016 02:38:53 +0100 Subject: [PATCH] configure.ac: Don't search llvm-config if it's known This way LLVM_CONFIG can bet set from an env variable if it's outside the $llvm_prefix. This is not a must, but it helps testing. Signed-off-by: Tobias Droste Reviewed-by: Emil Velikov --- configure.ac | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index f62bc61e502..fbe6fda0138 100644 --- a/configure.ac +++ b/configure.ac @@ -2166,10 +2166,12 @@ if test "x$enable_gallium_llvm" = xauto; then esac fi if test "x$enable_gallium_llvm" = xyes || test "x$HAVE_RADEON_VULKAN" = xyes; then - if test -n "$llvm_prefix"; then - AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"]) - else - AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no]) + if test -z "$LLVM_CONFIG"; then + if test -n "$llvm_prefix"; then + AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"]) + else + AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no]) + fi fi if test "x$LLVM_CONFIG" != xno; then -- 2.30.2