Mesa (master): configure: Only check for OpenCL without LLVM when the latter is certain
Tom Stellard
tstellar at kemper.freedesktop.org
Tue Jun 10 15:04:13 UTC 2014
Module: Mesa
Branch: master
Commit: 2d399bb1837e01856c8e489aa5ec439ce9a1fdbc
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2d399bb1837e01856c8e489aa5ec439ce9a1fdbc
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Tue Jun 10 11:25:04 2014 +0900
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: Michel Dänzer <michel.daenzer at amd.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
---
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1525b20..cb14c0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1462,10 +1462,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
@@ -1766,6 +1762,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
More information about the mesa-commit
mailing list