Quoting Andres Gomez (2018-02-28 13:15:07) > 3 digits versions in LLVM only started from 3.4.1 on. Hence, if you > have installed 3.4 or below, meson will fail even when we may not make > use of LLVM. > > v2: Properly compare LLVM version and set patch version to 0 > if < 3.4.1 (Eric). > > Cc: Dylan Baker <dy...@pnwbakers.com> > Cc: Eric Engestrom <eric.engest...@imgtec.com> > Signed-off-by: Andres Gomez <ago...@igalia.com> > --- > meson.build | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/meson.build b/meson.build > index 308f64cf811..e9928a37931 100644 > --- a/meson.build > +++ b/meson.build > @@ -1037,7 +1037,14 @@ if with_llvm > # that for our version checks. > # svn suffixes are stripped by meson as of 0.43, and git suffixes are > # strippped as of 0.44, but we support older meson versions. > - _llvm_patch = _llvm_version[2] > + > + # 3 digits versions in LLVM only started from 3.4.1 on > + if dep_llvm.version().version_compare('>= 3.4.1') > + _llvm_patch = _llvm_version[2] > + else > + _llvm_patch = '0' > + endif > + > if _llvm_patch.endswith('svn') > _llvm_patch = _llvm_patch.split('s')[0] > elif _llvm_patch.contains('git') > -- > 2.15.1 >
Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev