Index: configure.sh
===================================================================
--- configure.sh	(revision be62ebc4d3656422ba22949f370ffee42151748e)
+++ configure.sh	(revision d231a544e788294c23491fd976ae0ea08a44237e)
@@ -110,4 +110,5 @@
 PLATFORM=`sed -n '/^PLATFORM\b/p' Makefile.config | sed 's:[^=]*= ::'`
 MACHINE=`sed -n '/^MACHINE\b/p' Makefile.config | sed 's:[^=]*= ::'`
+COMPILER=`sed -n '/^COMPILER\b/p' Makefile.config | sed 's:[^=]*= ::'`
 
 cross_target="$PLATFORM"
@@ -119,8 +120,16 @@
 fi
 
+if [ "$COMPILER" = 'clang' ]; then
+    cross_target="${cross_target}_clang"
+fi
+
 cross_def="${SOURCE_DIR}/meson/cross/${cross_target}"
 cc_arch=`sed -n "s:cc_arch = '\(.*\)':\1:p" "$cross_def"`
 
-compname="$cc_arch-helenos-gcc"
+if [ "$COMPILER" = 'clang' ]; then
+    compname="$cc_arch-helenos-clang"
+else
+    compname="$cc_arch-helenos-gcc"
+fi
 unset compprefix
 
Index: kernel/meson.build
===================================================================
--- kernel/meson.build	(revision be62ebc4d3656422ba22949f370ffee42151748e)
+++ kernel/meson.build	(revision d231a544e788294c23491fd976ae0ea08a44237e)
@@ -117,5 +117,5 @@
 if not CONFIG_LINE_DEBUG
 	# Keep the debug info needed to get file names for kernel stack traces.
-	kernel_c_args += [ '-gdwarf-5', '-g1', '-gno-statement-frontiers' ]
+	kernel_c_args += cc.get_supported_arguments([ '-gdwarf-5', '-g1', '-gno-statement-frontiers' ])
 endif
 
Index: tools/toolchain.sh
===================================================================
--- tools/toolchain.sh	(revision be62ebc4d3656422ba22949f370ffee42151748e)
+++ tools/toolchain.sh	(revision d231a544e788294c23491fd976ae0ea08a44237e)
@@ -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"
 }