diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1412,10 +1412,17 @@
 _sysctl=sysctl
 .endif
 
+_strip=strip
+# If we aren't building a bootstrap llvm-strip, we have to link the explicitly
+# passed XSTRIPBIN variable, otherwise we fail to symlink the tool.
+.if ${MK_LLVM_BINUTILS_BOOTSTRAP} == "no"
+_strip=${XSTRIPBIN}
+.endif
+
 ITOOLS=	[ awk cap_mkdb cat chflags chmod chown cmp cp \
 	date echo egrep find grep id install \
 	ln make mkdir mtree mv pwd_mkdb \
-	rm sed services_mkdb sh sort strip ${_sysctl} test time true uname wc
+	rm sed services_mkdb sh sort ${_strip} ${_sysctl} test time true uname wc
 
 .if ${MK_ZONEINFO} != "no"
 ITOOLS+=tzsetup