build: Replace NEED_RADEON_LLVM with HAVE_GALLIUM_LLVM.
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
parent
6424795f52
commit
e457e6abec
|
@ -1012,7 +1012,6 @@ radeon_llvm_check() {
|
||||||
llvm_add_component "bitreader" $2
|
llvm_add_component "bitreader" $2
|
||||||
llvm_add_component "ipo" $2
|
llvm_add_component "ipo" $2
|
||||||
|
|
||||||
NEED_RADEON_LLVM=yes
|
|
||||||
if test "x$have_libelf" != xyes; then
|
if test "x$have_libelf" != xyes; then
|
||||||
AC_MSG_ERROR([$1 requires libelf when using llvm])
|
AC_MSG_ERROR([$1 requires libelf when using llvm])
|
||||||
fi
|
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_R600" = xyes -o \
|
||||||
"x$HAVE_GALLIUM_RADEONSI" = xyes)
|
"x$HAVE_GALLIUM_RADEONSI" = xyes)
|
||||||
AM_CONDITIONAL(NEED_WINSYS_XLIB, test "x$enable_glx" = xgallium-xlib)
|
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_COMPUTE, test x$enable_opencl = xyes)
|
||||||
AM_CONDITIONAL(HAVE_GALLIUM_LLVM, test "x$enable_llvm" = xyes)
|
AM_CONDITIONAL(HAVE_GALLIUM_LLVM, test "x$enable_llvm" = xyes)
|
||||||
AM_CONDITIONAL(USE_VC4_SIMULATOR, test x$USE_VC4_SIMULATOR = xyes)
|
AM_CONDITIONAL(USE_VC4_SIMULATOR, test x$USE_VC4_SIMULATOR = xyes)
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||||
# IN THE SOFTWARE.
|
# IN THE SOFTWARE.
|
||||||
|
|
||||||
if NEED_RADEON_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
|
|
||||||
COMMON_LIBS = common/libamd_common.la
|
COMMON_LIBS = common/libamd_common.la
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ TARGET_RADEON_WINSYS = \
|
||||||
TARGET_RADEON_COMMON = \
|
TARGET_RADEON_COMMON = \
|
||||||
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la
|
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la
|
||||||
|
|
||||||
if NEED_RADEON_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
TARGET_RADEON_COMMON += \
|
TARGET_RADEON_COMMON += \
|
||||||
$(top_builddir)/src/amd/common/libamd_common.la
|
$(top_builddir)/src/amd/common/libamd_common.la
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -17,7 +17,7 @@ libr600_la_SOURCES = \
|
||||||
$(C_SOURCES) \
|
$(C_SOURCES) \
|
||||||
$(CXX_SOURCES)
|
$(CXX_SOURCES)
|
||||||
|
|
||||||
if NEED_RADEON_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
|
|
||||||
AM_CFLAGS += \
|
AM_CFLAGS += \
|
||||||
$(LLVM_CFLAGS) \
|
$(LLVM_CFLAGS) \
|
||||||
|
|
|
@ -13,7 +13,7 @@ noinst_LTLIBRARIES = libradeon.la
|
||||||
libradeon_la_SOURCES = \
|
libradeon_la_SOURCES = \
|
||||||
$(C_SOURCES)
|
$(C_SOURCES)
|
||||||
|
|
||||||
if NEED_RADEON_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
|
|
||||||
AM_CFLAGS += \
|
AM_CFLAGS += \
|
||||||
$(LLVM_CFLAGS) \
|
$(LLVM_CFLAGS) \
|
||||||
|
|
|
@ -131,7 +131,7 @@ pipe_r600_la_LIBADD = \
|
||||||
$(LIBDRM_LIBS) \
|
$(LIBDRM_LIBS) \
|
||||||
$(RADEON_LIBS)
|
$(RADEON_LIBS)
|
||||||
|
|
||||||
if NEED_RADEON_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
pipe_r600_la_LIBADD += \
|
pipe_r600_la_LIBADD += \
|
||||||
$(top_builddir)/src/amd/common/libamd_common.la
|
$(top_builddir)/src/amd/common/libamd_common.la
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue