diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2013-01-25 20:50:31 -0500 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2013-01-28 18:30:37 +0000 |
| commit | 91a160b19f5954fad6b1282880b843e8b1f15df4 (patch) | |
| tree | 4ea43313981271422aa63499d0d739e64032726d | |
| parent | e110c98cae0ceae47db6cf26c08707505ce92479 (diff) | |
r600g: Fix building with --enable-r600-llvm-compiler
https://bugs.freedesktop.org/show_bug.cgi?id=59877
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/Makefile.am | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 9cc5c4ae5d1..1e352db6e8e 100644 --- a/configure.ac +++ b/configure.ac @@ -1834,14 +1834,12 @@ if test "x$with_gallium_drivers" != x; then if test "x$enable_r600_llvm" = xyes -o "x$enable_opencl" = xyes; then radeon_llvm_check NEED_RADEON_GALLIUM=yes; - LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo" + R600_NEED_RADEON_GALLIUM=yes; + LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo bitreader asmparser" fi if test "x$enable_r600_llvm" = xyes; then USE_R600_LLVM_COMPILER=yes; fi - if test "x$enable_opencl" = xyes -a "x$with_llvm_shared_libs" = xno; then - LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser" - fi gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600" ;; xradeonsi) @@ -1990,6 +1988,7 @@ AM_CONDITIONAL(HAVE_GALAHAD_GALLIUM, test x$HAVE_GALAHAD_GALLIUM = xyes) AM_CONDITIONAL(HAVE_IDENTITY_GALLIUM, test x$HAVE_IDENTITY_GALLIUM = xyes) AM_CONDITIONAL(HAVE_NOOP_GALLIUM, test x$HAVE_NOOP_GALLIUM = xyes) AM_CONDITIONAL(NEED_RADEON_GALLIUM, test x$NEED_RADEON_GALLIUM = xyes) +AM_CONDITIONAL(R600_NEED_RADEON_GALLIUM, test x$R600_NEED_RADEON_GALLIUM = xyes) AM_CONDITIONAL(USE_R600_LLVM_COMPILER, test x$USE_R600_LLVM_COMPILER = xyes) AM_CONDITIONAL(HAVE_LOADER_GALLIUM, test x$enable_gallium_loader = xyes) AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = xyes) diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am index 6de7e0f0564..6f48b56d9ae 100644 --- a/src/gallium/drivers/r600/Makefile.am +++ b/src/gallium/drivers/r600/Makefile.am @@ -13,8 +13,7 @@ AM_CFLAGS = \ libr600_la_SOURCES = \ $(C_SOURCES) -if USE_R600_LLVM_COMPILER -if HAVE_GALLIUM_COMPUTE +if R600_NEED_RADEON_GALLIUM libr600_la_SOURCES += \ $(LLVM_C_SOURCES) \ @@ -29,7 +28,6 @@ AM_CFLAGS += \ AM_CXXFLAGS= \ $(LLVM_CXXFLAGS) endif -endif if USE_R600_LLVM_COMPILER AM_CFLAGS += \ |