From: Marc Dietrich <marvin24@gmx.de>
Date: Wed, 24 Jan 2018 21:03:51 +0000 (+0100)
Subject: meson: fix HAVE_LLVM version define in meson build
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a2a1b0e75ef9adeb17468509c5f6331b42f6dc2e;p=mesa.git

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@imgtec.com>
Reviewed-by: Dylan Baker <dylan.c.baker@intel.com>
Signed-off-by: Marc Dietrich <marvin24@gmx.de>
---

diff --git a/meson.build b/meson.build
index eb85a4a5938..222b79d75cc 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@0@@1@@2@'.format(_llvm_version[0], _llvm_version[1], _llvm_patch),
+    '-DHAVE_LLVM=0x0@0@0@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