diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template
index 9a0d4d7652f..78fcbfa7681 100644
--- a/srcpkgs/mysql/template
+++ b/srcpkgs/mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql'
 pkgname=mysql
 version=5.6.43
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -31,9 +31,11 @@ system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
 lib32disabled=yes
 
-disable_parallel_build=yes
-
 CFLAGS="-D__STDC_ISO_10646__"
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -DHAVE_LLVM_LIBCPP_EXITCODE=1"
+	configure_args+=" -DHAVE_LLVM_LIBCPP_EXITCODE__TRYRUN_OUTPUT=0"
+fi
 
 pre_configure() {
 	# libressl major detection.
@@ -44,7 +46,7 @@ pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= cmake .
 		make comp_err comp_sql gen_lex_hash gen_lex_token
-		mkdir bin.host
+		mkdir -p bin.host
 		cp extra/comp_err bin.host
 		cp scripts/comp_sql bin.host
 		cp sql/gen_lex_hash bin.host