KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Replace NEED_RADEON_LLVM with HAVE_GALLIUM_LLVM. 

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Matt Turner 2017-03-06 09:35:33 -08:00
parent 6424795f52
commit e457e6abec
6 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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)

2
src/amd/Makefile.common.am
View File

@ -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

2
src/gallium/drivers/r600/Automake.inc
View File

@ -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

2
src/gallium/drivers/r600/Makefile.am
View File

@ -17,7 +17,7 @@ libr600_la_SOURCES = \
$(C_SOURCES) \
$(CXX_SOURCES)
if NEED_RADEON_LLVM
if HAVE_GALLIUM_LLVM
AM_CFLAGS += \
$(LLVM_CFLAGS) \

2
src/gallium/drivers/radeon/Makefile.am
View File

@ -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) \

2
src/gallium/targets/pipe-loader/Makefile.am
View File

@ -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