diff options
| author | Tobias Droste <[email protected]> | 2016-11-19 02:38:53 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-12-05 14:43:46 +0000 |
| commit | 2350387d24d6f2470450ee9e78792a9ee957034b (patch) | |
| tree | 37b48f9b4a2a1338aa2ee735335e041ec650fffc | |
| parent | 3949d7c6ead25e6191c6529a1805ba7ada6892cc (diff) | |
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 <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
| -rw-r--r-- | configure.ac | 10 |
1 files 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 |