[Mesa-dev] [PATCH] r600: add amdgpuinfo to the llvm required module list

[Marc Dietrich]

This fixes the build when mesa is build against a static libllvm and
consolidates the module collection a bit.

Signed-off-by: Marc Dietrich <marvin24 at gmx.de>
---
 configure.ac | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 890a37999c..adc81260a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1005,6 +1005,8 @@ radeon_llvm_check() {
     llvm_add_target $amdgpu_llvm_target_name $2
 
     llvm_add_default_components $2
+    llvm_add_component "amdgpuinfo" "r600"
+    llvm_add_component "asmparser" "r600"
     llvm_add_component "bitreader" $2
     llvm_add_component "ipo" $2
 
@@ -2297,11 +2299,8 @@ 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 -o "x$enable_opencl" = xyes; then
                 radeon_llvm_check $LLVM_REQUIRED_R600 "r600"
-
-                llvm_add_component "asmparser" "r600"
-                llvm_add_component "bitreader" "r600"
             fi
             ;;
         xradeonsi)
-- 
2.11.1