On 12 October 2016 at 00:02, Tobias Droste <tdro...@gmx.de> wrote:
> A function with the LLVM version checked is moved to the top.
> The function is called where the old code was.
Replace the second line with "... in order to reuse/rework X"
> No functional change.
>
> Signed-off-by: Tobias Droste <tdro...@gmx.de>
> ---
> configure.ac | 91
> ++++++++++++++++++++++++++++++++----------------------------
> 1 file changed, 49 insertions(+), 42 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 933e7b5..0f19a4f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -861,6 +861,54 @@ fi
> AC_SUBST([SELINUX_CFLAGS])
> AC_SUBST([SELINUX_LIBS])
>
> +dnl
> +dnl LLVM
> +dnl
> +llvm_get_version() {
Nit: The code below does a lot more than "get_version" -
get_environment/set_variables/other
With the above
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
> + 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.]]+'`
...
> + else
> + MESA_LLVM=0
> + LLVM_VERSION_INT=0
Just realised that we should error out in this case. After all one
requests llvm, so silently ignoring that they're missing llvm-config
isn't a smart idea. Something like below (be that as a preparatory,
in-between or at the end of the series) would be great.
if test "x$LLVM_CONFIG" = xno; then
AC_MSG_ERROR([...])
fi
LLVM_VERSION=...
...
-Emil
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
