From e457e6abec3c0c132bdc63f8849a3a970220c4e7 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 6 Mar 2017 09:35:33 -0800 Subject: [PATCH] build: Replace NEED_RADEON_LLVM with HAVE_GALLIUM_LLVM. Reviewed-by: Emil Velikov --- configure.ac | 2 -- src/amd/Makefile.common.am | 2 +- src/gallium/drivers/r600/Automake.inc | 2 +- src/gallium/drivers/r600/Makefile.am | 2 +- src/gallium/drivers/radeon/Makefile.am | 2 +- src/gallium/targets/pipe-loader/Makefile.am | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 21a73b031f4..7d712b41a71 100644 --- a/configure.ac +++ b/configure.ac @@ -1012,7 +1012,6 @@ radeon_llvm_check() { llvm_add_component "bitreader" $2 llvm_add_component "ipo" $2 - NEED_RADEON_LLVM=yes if test "x$have_libelf" != xyes; then AC_MSG_ERROR([$1 requires libelf when using llvm]) fi @@ -2523,7 +2522,6 @@ AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$HAVE_GALLIUM_R300" = xyes -o \ "x$HAVE_GALLIUM_R600" = xyes -o \ "x$HAVE_GALLIUM_RADEONSI" = xyes) AM_CONDITIONAL(NEED_WINSYS_XLIB, test "x$enable_glx" = xgallium-xlib) -AM_CONDITIONAL(NEED_RADEON_LLVM, test x$NEED_RADEON_LLVM = xyes) AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes) AM_CONDITIONAL(HAVE_GALLIUM_LLVM, test "x$enable_llvm" = xyes) AM_CONDITIONAL(USE_VC4_SIMULATOR, test x$USE_VC4_SIMULATOR = xyes) diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am index 832a9434dce..e492fbcb393 100644 --- a/src/amd/Makefile.common.am +++ b/src/amd/Makefile.common.am @@ -19,7 +19,7 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -if NEED_RADEON_LLVM +if HAVE_GALLIUM_LLVM COMMON_LIBS = common/libamd_common.la diff --git a/src/gallium/drivers/r600/Automake.inc b/src/gallium/drivers/r600/Automake.inc index 3ff5501d6c4..fa457359de6 100644 --- a/src/gallium/drivers/r600/Automake.inc +++ b/src/gallium/drivers/r600/Automake.inc @@ -13,7 +13,7 @@ TARGET_RADEON_WINSYS = \ TARGET_RADEON_COMMON = \ $(top_builddir)/src/gallium/drivers/radeon/libradeon.la -if NEED_RADEON_LLVM +if HAVE_GALLIUM_LLVM TARGET_RADEON_COMMON += \ $(top_builddir)/src/amd/common/libamd_common.la endif diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am index 3638e00f195..21762d838d0 100644 --- a/src/gallium/drivers/r600/Makefile.am +++ b/src/gallium/drivers/r600/Makefile.am @@ -17,7 +17,7 @@ libr600_la_SOURCES = \ $(C_SOURCES) \ $(CXX_SOURCES) -if NEED_RADEON_LLVM +if HAVE_GALLIUM_LLVM AM_CFLAGS += \ $(LLVM_CFLAGS) \ diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am index 64c2799ee97..57e31f751b3 100644 --- a/src/gallium/drivers/radeon/Makefile.am +++ b/src/gallium/drivers/radeon/Makefile.am @@ -13,7 +13,7 @@ noinst_LTLIBRARIES = libradeon.la libradeon_la_SOURCES = \ $(C_SOURCES) -if NEED_RADEON_LLVM +if HAVE_GALLIUM_LLVM AM_CFLAGS += \ $(LLVM_CFLAGS) \ diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index 26f79536fc1..5f629a29827 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -131,7 +131,7 @@ pipe_r600_la_LIBADD = \ $(LIBDRM_LIBS) \ $(RADEON_LIBS) -if NEED_RADEON_LLVM +if HAVE_GALLIUM_LLVM pipe_r600_la_LIBADD += \ $(top_builddir)/src/amd/common/libamd_common.la endif -- 2.30.2