diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile
index 4a8eaf265998..1e52d40fccab 100644
--- a/lib/clang/liblldb/Makefile
+++ b/lib/clang/liblldb/Makefile
@@ -1,8 +1,6 @@
 # $FreeBSD$
 
-LLVM_SRCS=	${SRCTOP}/contrib/llvm
-CLANG_SRCS=	${LLVM_SRCS}/tools/clang
-LLDB_SRCS=	${LLVM_SRCS}/tools/lldb
+.include "../lldb.pre.mk"
 
 LIB=		lldb
 SRCDIR=		tools/lldb/source
diff --git a/lib/clang/lldb.pre.mk b/lib/clang/lldb.pre.mk
new file mode 100644
index 000000000000..1849b9b35c97
--- /dev/null
+++ b/lib/clang/lldb.pre.mk
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+.include "clang.pre.mk"
+
+LLDB_SRCS=	${LLVM_SRCS}/tools/lldb
diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk
index 3228f3c4da06..96276ba90112 100644
--- a/usr.bin/clang/clang.prog.mk
+++ b/usr.bin/clang/clang.prog.mk
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
-LLVM_SRCS=	${SRCTOP}/contrib/llvm
-CLANG_SRCS=	${LLVM_SRCS}/tools/clang
+.include "${SRCTOP}/lib/clang/clang.pre.mk"
 
 CFLAGS+=	-I${OBJTOP}/lib/clang/libclang
 CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile
index 110e404aeefb..cb61bf1dd10d 100644
--- a/usr.bin/clang/lldb/Makefile
+++ b/usr.bin/clang/lldb/Makefile
@@ -1,8 +1,6 @@
 # $FreeBSD$
 
-LLVM_SRCS=	${SRCTOP}/contrib/llvm
-CLANG_SRCS=	${LLVM_SRCS}/tools/clang
-LLDB_SRCS=	${LLVM_SRCS}/tools/lldb
+.include "${SRCTOP}/lib/clang/lldb.pre.mk"
 
 PROG_CXX=	lldb
 # Man page directory
diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk
index 89165ab11f9e..8e54d141d5d2 100644
--- a/usr.bin/clang/llvm.prog.mk
+++ b/usr.bin/clang/llvm.prog.mk
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LLVM_SRCS=	${SRCTOP}/contrib/llvm
+.include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
 CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm