summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Droste <[email protected]>2016-11-19 02:38:59 +0100
committerEmil Velikov <[email protected]>2016-12-05 14:43:46 +0000
commit8c98e27074240a97daadddb0ba3a7e40cc7a646d (patch)
treea1d9422b3941fc755fec5a7609b0fb59f654de06
parent0cc4ffd67b7a9fa8d9f22aab0834f9eb004b659f (diff)
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 <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
-rw-r--r--configure.ac16
1 files 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`