Index: tools/toolchain.sh
===================================================================
--- tools/toolchain.sh	(revision 56210a7aca94cc904bb253efade72fb9a4cc1a40)
+++ tools/toolchain.sh	(revision 94ea2e3771e36d7eaa5eef3ba668b8f14e4c2291)
@@ -512,7 +512,9 @@
 	# Symlink clang and lld to the install path.
 	CLANG="`which clang 2> /dev/null || echo "/usr/bin/clang"`"
+	CLANGPP="`which clang++ 2> /dev/null || echo "/usr/bin/clang++"`"
 	LLD="`which ld.lld 2> /dev/null || echo "/usr/bin/ld.lld"`"
 
 	ln -s $CLANG "${INSTALL_DIR}${CROSS_PREFIX}/bin/${TARGET}-clang"
+	ln -s $CLANGPP "${INSTALL_DIR}${CROSS_PREFIX}/bin/${TARGET}-clang++"
 	ln -s $LLD "${INSTALL_DIR}${CROSS_PREFIX}/bin/${TARGET}-ld.lld"
 }