diff --git a/Makefile.defs b/Makefile.defs
index 2bbf6fa78c..4b3d9ebd6f 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -1124,7 +1124,7 @@ endif	#ARCH, sparc64
 	#if ipaq/netwinder
 ifeq	($(ARCH), arm)
 		# if gcc
-ifeq		($(CC_NAME), gcc)
+ifeq		($(CC_NAME:clang=gcc), gcc)
 				#common stuff
 				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops  -Wcast-align $(PROFILE) \
 					-Wall -marm
@@ -1298,7 +1298,7 @@ endif	#ARCH, ppc
 #if  ppc64
 ifeq	($(ARCH), ppc64)
 		# if gcc
-ifeq		($(CC_NAME), gcc)
+ifeq		($(CC_NAME:clang=gcc), gcc)
 				#common stuff
 				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops $(PROFILE)  -Wall
 ifeq			($(CC_CLASS), 4.x)
diff --git a/scripts/build/do_build.sh b/scripts/build/do_build.sh
index a102da8b5b..425fdba967 100755
--- a/scripts/build/do_build.sh
+++ b/scripts/build/do_build.sh
@@ -19,9 +19,9 @@ MAKE_CMD="${MAKE_ENV} make"
 
 if [ ! -z "${ONE_MODULE}" ]
 then
-  env CC_EXTRA_OPTS="${CC_EXTRA_OPTS:-"-Werror"}" ${MAKE_CMD} \
+  env CC_EXTRA_OPTS="${CC_EXTRA_OPTS:-"-Werror -Wno-atomic-alignment"}" ${MAKE_CMD} \
    -C "modules/${ONE_MODULE}"
 else
-  env CC_EXTRA_OPTS="${CC_EXTRA_OPTS:-"-Werror"}" ${MAKE_CMD} \
+  env CC_EXTRA_OPTS="${CC_EXTRA_OPTS:-"-Werror -Wno-atomic-alignment"}" ${MAKE_CMD} \
    exclude_modules="${EXCLUDE_MODULES}" "${@}" ${MAKE_TGT:-"all"}
 fi
diff --git a/scripts/build/install_depends.sh b/scripts/build/install_depends.sh
index 845e4989d3..d8b62dfdf2 100755
--- a/scripts/build/install_depends.sh
+++ b/scripts/build/install_depends.sh
@@ -15,6 +15,10 @@ do
   then
     pkg="python-dev-is-python3"
   fi
+  if [ "${BUILD_OS%-*}" = "debian" -a "${pkg}" = libmysqlclient-dev ]
+  then
+    pkg="libmariadb-dev"
+  fi
   _PKGS="${_PKGS} ${pkg}"
 done
 PKGS="${_PKGS}"