Mesa (master): meson: fix HAVE_LLVM version define in meson build

[Dylan Baker]

Module: Mesa
Branch: master
Commit: a2a1b0e75ef9adeb17468509c5f6331b42f6dc2e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a2a1b0e75ef9adeb17468509c5f6331b42f6dc2e

Author: Marc Dietrich <marvin24 at gmx.de>
Date:   Wed Jan 24 22:03:51 2018 +0100

meson: fix HAVE_LLVM version define in meson build

LLVM patch level is not included in HAVE_LLVM.

Fixes: e6418ab1566d ("meson: build "radv" vulkan driver for radeon hardware")
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>
Reviewed-by: Dylan Baker <dylan.c.baker at intel.com>
Signed-off-by: Marc Dietrich <marvin24 at gmx.de>

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index eb85a4a593..222b79d75c 100644
--- a/meson.build
+++ b/meson.build
@@ -1025,7 +1025,7 @@ if with_llvm
     _llvm_patch = _llvm_patch.split('s')[0]
   endif
   pre_args += [
-    '-DHAVE_LLVM=0x0 at 0@@1@@2@'.format(_llvm_version[0], _llvm_version[1], _llvm_patch),
+    '-DHAVE_LLVM=0x0 at 0@0 at 1@'.format(_llvm_version[0], _llvm_version[1]),
     '-DMESA_LLVM_VERSION_PATCH=@0@'.format(_llvm_patch),
   ]
 elif with_amd_vk or with_gallium_radeonsi or with_gallium_swr