r600g: fix build without opencl and static llvm libs
authorMarc Dietrich <marvin24@gmx.de>
Mon, 27 Feb 2017 15:35:13 +0000 (16:35 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Wed, 1 Mar 2017 13:22:48 +0000 (13:22 +0000)
radeon_llvm_check and friends were never called in the no-opencl case,
which ended up with an empty llvm module list. As --enable-opencl always
requires --enable-llvm, we can use the latter as the guard.

Signed-off-by: Marc Dietrich <marvin24@gmx.de>
[Emil Velikov: commit message polish]
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
configure.ac

index 890a37999cfe94b57c6df04a664c6d0ad506a842..a3d1a00bdd00f0a8d7938bca5e5e136a6042a3a3 100644 (file)
@@ -2297,7 +2297,7 @@ if test -n "$with_gallium_drivers"; then
             HAVE_GALLIUM_R600=yes
             PKG_CHECK_MODULES([RADEON], [libdrm >= $LIBDRM_RADEON_REQUIRED libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
             require_libdrm "r600"
-            if test "x$enable_opencl" = xyes; then
+            if test "x$enable_llvm" = xyes; then
                 radeon_llvm_check $LLVM_REQUIRED_R600 "r600"
 
                 llvm_add_component "asmparser" "r600"