From 8c98e27074240a97daadddb0ba3a7e40cc7a646d Mon Sep 17 00:00:00 2001 From: Tobias Droste Date: Sat, 19 Nov 2016 02:38:59 +0100 Subject: [PATCH] configure.ac: Move llvm-config searching outside the function There's no harm in always searching llvm-config. This way it's available as soon as possible for all functions. Signed-off-by: Tobias Droste Reviewed-by: Emil Velikov --- configure.ac | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 4add91e7da5..78eb8cb9ff1 100644 --- a/configure.ac +++ b/configure.ac @@ -887,6 +887,14 @@ if test "x$have_libelf" = xno; then AC_SUBST([LIBELF_CFLAGS]) fi +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 + llvm_add_component() { new_llvm_component=$1 driver_name=$2 @@ -948,14 +956,6 @@ strip_unwanted_llvm_flags() { } llvm_set_environment_variables() { - 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 LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'` LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` -- 2.30.2