Skip to content
Snippets Groups Projects
Commit 920428a3 authored by Michel Dänzer's avatar Michel Dänzer Committed by Carl Worth
Browse files

configure: Only check for OpenCL without LLVM when the latter is certain


LLVM is enabled by default for some architectures, but the test was failing
before that.

Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: default avatarTom Stellard <thomas.stellard@amd.com>

Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 2d399bb1)
parent 77619d92
No related branches found
No related tags found
Loading
......@@ -1376,10 +1376,6 @@ if test "x$enable_opencl" = xyes; then
AC_MSG_ERROR([cannot enable OpenCL without Gallium])
fi
if test "x$enable_gallium_llvm" != xyes; then
AC_MSG_ERROR([cannot enable OpenCL without LLVM])
fi
if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 7; then
AC_MSG_ERROR([gcc >= 4.7 is required to build clover])
fi
......@@ -1663,6 +1659,10 @@ if test "x$enable_gallium_llvm" = xyes; then
else
MESA_LLVM=0
LLVM_VERSION_INT=0
if test "x$enable_opencl" = xyes; then
AC_MSG_ERROR([cannot enable OpenCL without LLVM])
fi
fi
dnl Directory for XVMC libs
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment