[src/trunk]: src/external/mit/xorg/lib Don't hard-code LLVM version, extract ...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3f512e8e9873
branches:  trunk
changeset: 745113:3f512e8e9873
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun Feb 23 02:03:19 2020 +0000

description:
Don't hard-code LLVM version, extract it from external/apache2/llvm.

diffstat:

 external/mit/xorg/lib/libmesa.mk |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 3745ccd2238a -r 3f512e8e9873 external/mit/xorg/lib/libmesa.mk
--- a/external/mit/xorg/lib/libmesa.mk  Sun Feb 23 02:02:32 2020 +0000
+++ b/external/mit/xorg/lib/libmesa.mk  Sun Feb 23 02:03:19 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: libmesa.mk,v 1.10 2020/01/31 20:58:18 jmcneill Exp $
+#      $NetBSD: libmesa.mk,v 1.11 2020/02/23 02:03:19 joerg Exp $
 #
 # Consumer of this Makefile should set MESA_SRC_MODULES.
 
@@ -533,8 +533,10 @@
        -DHAVE_MINCORE
 
 .if ${MKLLVMRT} != "no"
+LLVM_VERSION!=         cd ${NETBSDSRCDIR}/external/apache2/llvm && ${MAKE} -V LLVM_VERSION
+HAVE_LLVM_VERSION!=    expr ${LLVM_VERSION:R:R} \* 256 + ${LLVM_VERSION:R:E} \* 16
 CPPFLAGS+=     \
-       -DHAVE_LLVM=0x0900
+       -DHAVE_LLVM=${HAVE_LLVM_VERSION}
 CXXFLAGS+=     -fno-rtti
 .endif