Update build infrastructure for LLVM 10.0.0.

ok hackroom@
tested by plenty

1 files changed, 10 insertions, 8 deletions

diff --git a/gnu/usr.bin/clang/Makefile.inc b/gnu/usr.bin/clang/Makefile.inc
index 2bda4878c0f..841c3279b43 100644
--- a/gnu/usr.bin/clang/Makefile.inc
+++ b/gnu/usr.bin/clang/Makefile.inc
@@ -1,6 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.18 2019/11/26 10:58:23 sthen Exp $
+# $OpenBSD: Makefile.inc,v 1.19 2020/08/03 14:45:22 patrick Exp $
 
-LLVM_SRCS?=	${.CURDIR}/../../../llvm
+CLANG_SRCS?=	${.CURDIR}/../../../llvm/clang
+LLDB_SRCS?=	${.CURDIR}/../../../llvm/lldb
+LLD_SRCS?=	${.CURDIR}/../../../llvm/lld
+LLVM_SRCS?=	${.CURDIR}/../../../llvm/llvm
 
 .if ${COMPILER_VERSION:L} != "clang"
 CC=		clang
@@ -16,9 +19,9 @@ CXX=		eg++
 DEBUG=
 NOPIE=
 
-CLANG_INCLUDES=	-I${LLVM_SRCS}/tools/clang/include
-LLDB_INCLUDES=	-I${LLVM_SRCS}/tools/lldb/include \
-		-I${LLVM_SRCS}/tools/lldb/source
+CLANG_INCLUDES=	-I${CLANG_SRCS}/include
+LLDB_INCLUDES=	-I${LLDB_SRCS}/include \
+		-I${LLDB_SRCS}/source
 CPPFLAGS+=	-I${LLVM_SRCS}/include -I${.CURDIR}/../include -I${.OBJDIR} \
 		-I${.OBJDIR}/../include
 CPPFLAGS+=	-DNDEBUG
@@ -53,15 +56,14 @@ TRIPLE=		${MACHINE_ARCH}-unknown-openbsd${OSREV}
 .endif
 CPPFLAGS+=	-DLLVM_PREFIX=\"/usr\"
 .include "Makefile.arch"
-CPPFLAGS+=-DLLDB_DISABLE_PYTHON
 
 # upstream defaults
 CFLAGS+=	-ffunction-sections
 .if ${MACHINE_ARCH} != "powerpc"
 # XXX
-CFLAGS+=        -fdata-sections
+CFLAGS+=	-fdata-sections
 .endif
-CXXFLAGS+=	-std=c++11
+CXXFLAGS+=	-std=c++14
 CXXFLAGS+=	-fvisibility-inlines-hidden
 CXXFLAGS+=	-fno-exceptions -fno-rtti
 # warnings (from upstream)