Use clang compiler when configured as such

Author: le-jzr

configure.sh

@@ -109,6 +109,7 @@ fi
 
 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"
 if [ "$PLATFORM" = 'abs32le' ]; then
@@ -118,10 +119,18 @@ if [ "$MACHINE" = 'bmalta' ]; then
 	cross_target='mips32eb'
 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
 
 if which "$compname" >/dev/null 2>/dev/null; then

kernel/meson.build

@@ -116,7 +116,7 @@ kernel_c_args = arch_kernel_c_args + kernel_defs + [
 
 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
 
 if CONFIG_LTO

tools/toolchain.sh

@@ -511,9 +511,11 @@ install_pkg() {
 link_clang() {
 	# 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"
 }