Module Name: src
Committed By: joerg
Date: Sun Feb 23 02:03:19 UTC 2020
Modified Files:
src/external/mit/xorg/lib: libmesa.mk
Log Message:
Don't hard-code LLVM version, extract it from external/apache2/llvm.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libmesa.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libmesa.mk
diff -u src/external/mit/xorg/lib/libmesa.mk:1.10 src/external/mit/xorg/lib/libmesa.mk:1.11
--- src/external/mit/xorg/lib/libmesa.mk:1.10 Fri Jan 31 20:58:18 2020
+++ src/external/mit/xorg/lib/libmesa.mk Sun Feb 23 02:03:19 2020
@@ -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 @@ CPPFLAGS+= \
-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
