diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4
index 38fc304729..4fff31ee66 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -58,6 +58,15 @@ arm-*)
 	gdbConfigureArgs="--disable-multilib --disable-werror -enable-interwork"
 	gdbTarget="arm-unknown-elf"
 	;;
+riscv*-*)
+	binutilsConfigureArgs="--disable-multilib"
+	gccConfigureArgs="--disable-multilib"
+	gdbConfigureArgs="--disable-multilib"
+
+	# TODO: Disable building with TLS support for riscv until implemented.
+	binutilsConfigureArgs="$binutilsConfigureArgs --disable-tls"
+	gccConfigureArgs="$gccConfigureArgs --disable-tls"
+	;;
 powerpc-*)
 	binutilsConfigureArgs="--disable-multilib"
 	gccConfigureArgs="--disable-multilib"