diff options
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/SConscript | 4 |
4 files changed, 7 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 2f1d13ce6ef..4d9d9e59280 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,7 @@ LLVM_REQUIRED_OPENCL=3.9.0 LLVM_REQUIRED_R600=3.9.0 LLVM_REQUIRED_RADEONSI=6.0.0 LLVM_REQUIRED_RADV=6.0.0 -LLVM_REQUIRED_SWR=5.0.0 +LLVM_REQUIRED_SWR=6.0.0 dnl Check for progs AC_PROG_CPP @@ -2816,9 +2816,8 @@ if test -n "$with_gallium_drivers"; then fi # XXX: Keep in sync with LLVM_REQUIRED_SWR -AM_CONDITIONAL(SWR_INVALID_LLVM_VERSION, test "x$LLVM_VERSION" != x5.0.0 -a \ - "x$LLVM_VERSION" != x5.0.1 -a \ - "x$LLVM_VERSION" != x5.0.2) +AM_CONDITIONAL(SWR_INVALID_LLVM_VERSION, test "x$LLVM_VERSION" != x6.0.0 -a \ + "x$LLVM_VERSION" != x6.0.1) if test "x$enable_llvm" = "xyes" -a "$with_gallium_drivers"; then llvm_require_version $LLVM_REQUIRED_GALLIUM "gallium" diff --git a/meson.build b/meson.build index fa3367d1fa7..1b3dfa221c9 100644 --- a/meson.build +++ b/meson.build @@ -1160,7 +1160,7 @@ endif if with_amd_vk or with_gallium_radeonsi _llvm_version = '>= 6.0.0' elif with_gallium_swr - _llvm_version = '>= 5.0.0' + _llvm_version = '>= 6.0.0' elif with_gallium_opencl or with_gallium_r600 _llvm_version = '>= 3.9.0' else diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am index 5cc3f77478a..d20a6bdbed3 100644 --- a/src/gallium/drivers/swr/Makefile.am +++ b/src/gallium/drivers/swr/Makefile.am @@ -375,7 +375,7 @@ include $(top_srcdir)/install-gallium-links.mk dist-hook: if SWR_INVALID_LLVM_VERSION @echo "*****************************************" - @echo "LLVM 5.0.x required to create the tarball" + @echo "LLVM 6.0.x required to create the tarball" @echo "*****************************************" @test endif diff --git a/src/gallium/drivers/swr/SConscript b/src/gallium/drivers/swr/SConscript index 224372eb3f5..a89d02c5db0 100644 --- a/src/gallium/drivers/swr/SConscript +++ b/src/gallium/drivers/swr/SConscript @@ -12,8 +12,8 @@ if not env['llvm']: env['swr'] = False Return() -if env['LLVM_VERSION'] < distutils.version.LooseVersion('5.0'): - print("warning: swr requires LLVM >= 5.0: not building swr") +if env['LLVM_VERSION'] < distutils.version.LooseVersion('6.0'): + print("warning: swr requires LLVM >= 6.0: not building swr") env['swr'] = False Return() |