diff --git a/scripts/automator/build/os-darwin b/scripts/automator/build/os-darwin
index fc79d90c..ec200211 100644
--- a/scripts/automator/build/os-darwin
+++ b/scripts/automator/build/os-darwin
@@ -2,9 +2,11 @@
 ar="ar"
 ranlib="ranlib"
 function make_binary() {
+    # Limit GCC to ASCII-only characters
+    LC_ALL=C LANG=en_US LANGUAGE=en_US \
 	gmake \
 		--jobs="$(sysctl -n hw.physicalcpu)" \
 		--output-sync=line \
 		2>&1 | tee build.log
 }
-dependencies=("otool" "-L" "${executable}")
+dependencies=(otool -L "${executable}")
diff --git a/scripts/automator/build/os-defaults b/scripts/automator/build/os-defaults
index cf0d6028..572d999d 100644
--- a/scripts/automator/build/os-defaults
+++ b/scripts/automator/build/os-defaults
@@ -1,9 +1,9 @@
 # Steps in-common to all OSes, plus some helper variables and functions.
 
-STEPS=("pre_build" "clean" "autogen" "configure" "make_binary" "strip_binary" "dependencies" "post_build")
+STEPS=(pre_build clean autogen configure make_binary strip_binary dependencies post_build)
 
 executable="src/dosbox"
-dependencies=("ldd" "${executable}")
+dependencies=(ldd "${executable}")
 
 function pre_build() {
 	cd ../..
@@ -28,8 +28,8 @@ function autogen() {
 
 function configure() {
 	if [[ ! -f Makefile || ! -f .previous_build || configure -nt Makefile ]]; then
-		export CXXFLAGS="${CFLAGS}"
-		./configure --enable-core-inline
+		export CXXFLAGS="${CFLAGS} ${CXXONLY}"
+		./configure --enable-core-inline ${configure_additions[*]}
 	fi
 }
 
diff --git a/scripts/automator/build/os-linux b/scripts/automator/build/os-linux
index 0ac8ef02..96d3983f 100644
--- a/scripts/automator/build/os-linux
+++ b/scripts/automator/build/os-linux
@@ -1,5 +1,7 @@
 #!/bin/bash
 function make_binary() {
+	# Limit GCC to ASCII-only characters
+	LC_ALL=C LANG=en_US LANGUAGE=en_US \
 	make \
 		--jobs="$(nproc)" \
 		--output-sync=line \
diff --git a/scripts/automator/build/os-msys_nt b/scripts/automator/build/os-msys_nt
index b874e048..44ad88d1 100644
--- a/scripts/automator/build/os-msys_nt
+++ b/scripts/automator/build/os-msys_nt
@@ -1,4 +1,6 @@
 function make_binary() {
+    # Limit GCC to ASCII-only characters
+    LC_ALL=C LANG=en_US LANGUAGE=en_US \
 	make \
 		--jobs=$(nproc) \
 		--output-sync=line \