diff --git a/lib/clang/Makefile.inc b/lib/clang/Makefile.inc
--- a/lib/clang/Makefile.inc
+++ b/lib/clang/Makefile.inc
@@ -1,6 +1,6 @@
 .include <src.opts.mk>
 
-PACKAGE=	clang
+PACKAGE?=	clang
 MK_PIE:=	no	# Explicit libXXX.a references
 
 .if ${MK_LLVM_FULL_DEBUGINFO} == "no"
diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile
--- a/lib/clang/liblldb/Makefile
+++ b/lib/clang/liblldb/Makefile
@@ -6,7 +6,6 @@
 LIB=		lldb
 INTERNALLIB=
 .else
-PACKAGE=	lldb
 SHLIB_CXX=	lldb
 SHLIB_MAJOR=	21
 PRIVATELIB=
diff --git a/lib/clang/lldb.pre.mk b/lib/clang/lldb.pre.mk
--- a/lib/clang/lldb.pre.mk
+++ b/lib/clang/lldb.pre.mk
@@ -1,4 +1,6 @@
 
 .include "clang.pre.mk"
 
+PACKAGE=	lldb
+
 LLDB_SRCS=	${LLVM_BASE}/lldb
diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile
--- a/usr.bin/clang/lldb-server/Makefile
+++ b/usr.bin/clang/lldb-server/Makefile
@@ -1,6 +1,5 @@
 .include "${SRCTOP}/lib/clang/lldb.pre.mk"
 
-PACKAGE=	lldb
 PROG_CXX=	lldb-server
 
 CFLAGS+=	-I${LLDB_SRCS}/include
diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile
--- a/usr.bin/clang/lldb/Makefile
+++ b/usr.bin/clang/lldb/Makefile
@@ -1,6 +1,5 @@
 .include "${SRCTOP}/lib/clang/lldb.pre.mk"
 
-PACKAGE=	lldb
 PROG_CXX=	lldb
 
 CFLAGS+=	-I${LLDB_SRCS}/include