AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure.ac: Move llvm-config searching outside the function

Browse Source 
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 <tdroste@gmx.de>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Tobias Droste
2016-11-19 02:38:59 +01:00
committed by Emil Velikov
parent 0cc4ffd67b
commit 8c98e27074
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+8 -8
View File
@@ -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`