diff --git a/Makefile.libcompat b/Makefile.libcompat
index d038e4f42162..c2c729fdcfe1 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -126,7 +126,7 @@ LIBCOMPATWMAKE+=	${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
 			MAKEOBJDIRPREFIX= \
 			MK_MAN=no MK_HTML=no
 LIBCOMPATIMAKE+=	${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \
-			MK_TOOLCHAIN=no ${IMAKE_INSTALL} \
+			${IMAKE_INSTALL} \
 			-DLIBRARIES_ONLY
 
 _LC_LIBDIRS.yes=		lib
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
index a2dc5478bf56..4b39ef388d65 100644
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -16,6 +16,7 @@ CRTSRC=		${SRCTOP}/contrib/compiler-rt
 
 CLANGDIR=	/usr/lib/clang/6.0.1
 LIBDIR=		${CLANGDIR}/lib/freebsd
+SHLIBDIR=	${LIBDIR}
 
 NO_PIC=
 MK_PROFILE=	no