diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-01-30 09:19:39 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-01-30 09:27:14 -0800 |
| commit | 1f5f12687f69d1b4fd19d51b82d8579ea7d599b4 (patch) | |
| tree | 88182c72a3537473d0539bfaf01749873b156f26 | |
| parent | 90a7a9c973193929ec758057f82c612fb69890a1 (diff) | |
configure: Bump SWR LLVM requirement to 7
It is currently impossible to build a dist tarball that works when SWR
requires LLVM 6. To generate the tarball we'd need to configure with
LLVM 6, which is fine. But to build the dist check we need LLVM 7, as
RadeonSI and RadV require that version. Unfortunately the headers
genererated with LLVM 6 don't compile with LLVM 7, the API has changed
between the two versions.
I weighed a couple of options here. One would be to ship an
unbootstrapped tarball generated with meson. This would fix the issue
by not bootstrapping, so whatever version of LLVM used would work
because the SWR headers would be generated at compile
time. Unfortunately this would involve some heavy modifications to the
infastructure used to upload the tarballs, and I've decided not to
persue this.
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 858da79f4d0..d169223094f 100644 --- a/configure.ac +++ b/configure.ac @@ -122,7 +122,7 @@ LLVM_REQUIRED_OPENCL=3.9.0 LLVM_REQUIRED_R600=3.9.0 LLVM_REQUIRED_RADEONSI=7.0.0 LLVM_REQUIRED_RADV=7.0.0 -LLVM_REQUIRED_SWR=6.0.0 +LLVM_REQUIRED_SWR=7.0.0 dnl Check for progs AC_PROG_CPP @@ -2845,8 +2845,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" != x6.0.0 -a \ - "x$LLVM_VERSION" != x6.0.1) +AM_CONDITIONAL(SWR_INVALID_LLVM_VERSION, test "x$LLVM_VERSION" != x7.0.0 -a \ + "x$LLVM_VERSION" != x7.0.1) if test "x$enable_llvm" = "xyes" -a "$with_gallium_drivers"; then llvm_require_version $LLVM_REQUIRED_GALLIUM "gallium" |