fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 02:50:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

configure.ac: Check gallium LLVM version in gallium_require_llvm

Browse source 
This moves the LLVM version check to the helper function
gallium_require_llvm() and uses the llvm_check_version_for() helper
instead of open conding the LLVM version check.

gallium_require_llvm is functionally the same as before, because
"enable_gallium_llvm" is only set to "yes" if the host cpu is x86:

if test "x$enable_gallium_llvm" = xauto; then
    case "$host_cpu" in
    i*86|x86_64|amd64) enable_gallium_llvm=yes;;
    esac
fi

This function is also only called now when needed.
Before this patch llvmpipe would call this as soon as LLVM is
installed. Now it only gets called by llvmpipe if gallium
LLVM is actually enabled (i.e. only on x86).

Both reasons mentioned above remove the need to check host cpu
in the gallium_require_llvm function.

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:39:02 +01:00 • committed by Emil Velikov
parent 44a672ef0e
commit b3119a3360
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configure.ac
View file

@ -982,12 +982,6 @@ llvm_set_environment_variables() {
LLVM_VERSION_INT=`echo $LLVM_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/\10\2/g'` LLVM_VERSION_INT=`echo $LLVM_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/\10\2/g'`
fi fi
LLVM_REQUIRED_VERSION_MAJOR="3"
LLVM_REQUIRED_VERSION_MINOR="3"
if test "$LLVM_VERSION_INT" -lt "${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}"; then
AC_MSG_ERROR([LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR or newer is required])
fi
llvm_add_default_components "gallium" llvm_add_default_components "gallium"
if test "x$enable_opencl" = xyes; then if test "x$enable_opencl" = xyes; then
@ -2348,11 +2342,10 @@ dnl
dnl Gallium helper functions dnl Gallium helper functions
dnl dnl
gallium_require_llvm() { gallium_require_llvm() {
if test "x$MESA_LLVM" = x0; then if test "x$enable_gallium_llvm" == "xyes"; then
case "$host" in *gnux32) return;; esac llvm_check_version_for "3" "3" "0" "gallium"
case "$host_cpu" in else
i*86|x86_64|amd64) AC_MSG_ERROR([LLVM is required to build $1 on x86 and x86_64]);; AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
esac
fi fi
} }
@ -2485,7 +2478,7 @@ if test -n "$with_gallium_drivers"; then
;; ;;
xswrast) xswrast)
HAVE_GALLIUM_SOFTPIPE=yes HAVE_GALLIUM_SOFTPIPE=yes
if test "x$MESA_LLVM" = x1; then if test "x$MESA_LLVM" = x1 && test "x$enable_gallium_llvm" == "xyes"; then
HAVE_GALLIUM_LLVMPIPE=yes HAVE_GALLIUM_LLVMPIPE=yes
fi fi
;; ;;