diff options
| author | Emil Velikov <[email protected]> | 2013-09-17 18:29:19 +0100 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2013-10-01 07:29:49 -0700 |
| commit | 6ea73bb39528401fe5aca7c52692f7f6a628c6a7 (patch) | |
| tree | 937205abe01bf7daa50418489a5740ef835f0543 | |
| parent | 4334666b4786683315ee2c5e97eebb02bbad2a62 (diff) | |
r600: use NEED_RADEON_LLVM over R600_NEED_RADEON_GALLIUM
libllvmradeon.la is available whenever NEED_RADEON_LLVM is set, using
R600_NEED_RADEON_GALLIUM is rather ambiguous and unnecessary. Drop it
in favour of NEED_RADEON_LLVM.
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Tom Stellard <[email protected]>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/Makefile.am | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 389ac9180a4..1fbca0e68bb 100644 --- a/configure.ac +++ b/configure.ac @@ -1781,7 +1781,6 @@ if test "x$with_gallium_drivers" != x; then GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600" if test "x$enable_r600_llvm" = xyes -o "x$enable_opencl" = xyes; then radeon_llvm_check - R600_NEED_RADEON_GALLIUM=yes; LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser" fi if test "x$enable_r600_llvm" = xyes; then @@ -1937,7 +1936,6 @@ AM_CONDITIONAL(NEED_WINSYS_WRAPPER, test "x$HAVE_GALLIUM_I915" = xyes -o \ "x$HAVE_GALLIUM_SVGA" = xyes) AM_CONDITIONAL(NEED_WINSYS_XLIB, test "x$NEED_WINSYS_XLIB" = xyes) AM_CONDITIONAL(NEED_RADEON_LLVM, test x$NEED_RADEON_LLVM = 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 9203d03292b..cbe4a09d57f 100644 --- a/src/gallium/drivers/r600/Makefile.am +++ b/src/gallium/drivers/r600/Makefile.am @@ -24,7 +24,7 @@ libr600_la_SOURCES = \ libr600_la_LIBADD = ../radeon/libradeon.la -if R600_NEED_RADEON_GALLIUM +if NEED_RADEON_LLVM libr600_la_SOURCES += \ $(LLVM_C_SOURCES) |