From 8f153efb380c71e0ca9fbeed54200684ec88ffda Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sun, 20 Jan 2019 15:32:38 -0700
Subject: [PATCH] Add build argument to autotools stuff

---
 config.sh                       | 2 ++
 recipes/autoconf/recipe.sh      | 2 +-
 recipes/automake/recipe.sh      | 2 +-
 recipes/bash/recipe.sh          | 2 +-
 recipes/cmatrix/recipe.sh       | 2 +-
 recipes/curl/recipe.sh          | 1 +
 recipes/dash/recipe.sh          | 2 +-
 recipes/diffutils/recipe.sh     | 2 +-
 recipes/dosbox/recipe.sh        | 2 +-
 recipes/expat/recipe.sh         | 2 +-
 recipes/freeciv/recipe.sh       | 1 +
 recipes/freetype/recipe.sh      | 2 +-
 recipes/gawk/recipe.sh          | 2 +-
 recipes/gcc/recipe.sh           | 1 +
 recipes/gettext/recipe.sh       | 1 +
 recipes/git/recipe.sh           | 2 +-
 recipes/glib/recipe.sh          | 1 +
 recipes/gnu-binutils/recipe.sh  | 2 +-
 recipes/gnu-grep/recipe.sh      | 2 +-
 recipes/gnu-make/recipe.sh      | 2 +-
 recipes/gstreamer/recipe.sh     | 1 +
 recipes/harfbuzz/recipe.sh      | 1 +
 recipes/jansson/recipe.sh       | 2 +-
 recipes/libffi/recipe.sh        | 1 +
 recipes/libiconv/recipe.sh      | 2 +-
 recipes/libjpeg/recipe.sh       | 2 +-
 recipes/libpng/recipe.sh        | 2 +-
 recipes/libsodium/recipe.sh     | 3 +--
 recipes/mesa/recipe.sh          | 1 +
 recipes/mesa_glu/recipe.sh      | 2 +-
 recipes/nasm/recipe.sh          | 2 +-
 recipes/ncdu/recipe.sh          | 2 +-
 recipes/ncurses/recipe.sh       | 1 +
 recipes/ncursesw/recipe.sh      | 2 +-
 recipes/newlib/recipe.sh        | 2 +-
 recipes/openjazz/recipe.sh      | 2 +-
 recipes/openttd/recipe.sh       | 2 +-
 recipes/patch/recipe.sh         | 2 +-
 recipes/pcre/recipe.sh          | 1 +
 recipes/perl/recipe.sh          | 2 +-
 recipes/pixman/recipe.sh        | 9 +++++----
 recipes/prboom/recipe.sh        | 2 +-
 recipes/python/recipe.sh        | 2 +-
 recipes/qemu/recipe.sh          | 1 +
 recipes/readline/recipe.sh      | 2 +-
 recipes/schismtracker/recipe.sh | 2 +-
 recipes/scummvm/recipe.sh       | 1 +
 recipes/sdl/recipe.sh           | 1 +
 recipes/sdl2/recipe.sh          | 1 +
 recipes/sdl_gfx/recipe.sh       | 2 +-
 recipes/sdl_image/recipe.sh     | 2 +-
 recipes/sdl_mixer/recipe.sh     | 1 +
 recipes/sdl_ttf/recipe.sh       | 2 +-
 recipes/sed/recipe.sh           | 2 +-
 recipes/sopwith/recipe.sh       | 2 +-
 recipes/ssh/recipe.sh           | 2 +-
 recipes/timidity/recipe.sh      | 2 +-
 recipes/vim/recipe.sh           | 2 +-
 recipes/vttest/recipe.sh        | 2 +-
 recipes/xz/recipe.sh            | 2 +-
 60 files changed, 65 insertions(+), 47 deletions(-)

diff --git a/config.sh b/config.sh
index 087774eb6..752a910c2 100755
--- a/config.sh
+++ b/config.sh
@@ -28,6 +28,8 @@ export RANLIB="${HOST}-gcc-ranlib"
 export READELF="${HOST}-readelf"
 export STRIP="${HOST}-strip"
 
+BUILD="$(cc -dumpmachine)"
+
 export PKG_CONFIG_FOR_BUILD="pkg-config"
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
diff --git a/recipes/autoconf/recipe.sh b/recipes/autoconf/recipe.sh
index 0d1447d86..2c703e47d 100644
--- a/recipes/autoconf/recipe.sh
+++ b/recipes/autoconf/recipe.sh
@@ -13,7 +13,7 @@ function recipe_update {
 
 function recipe_build {
     wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-    ./configure --host=${HOST} --prefix=''
+    ./configure --build=${BUILD} --host=${HOST} --prefix=''
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/automake/recipe.sh b/recipes/automake/recipe.sh
index d35d47719..3731ad312 100644
--- a/recipes/automake/recipe.sh
+++ b/recipes/automake/recipe.sh
@@ -16,7 +16,7 @@ function recipe_build {
     sed -i 's|.*/doc/help2man.*|\&\& true|' Makefile.in
     sed -i 's|install-info-am install-man|install-info-am|' Makefile.in
 
-    ./configure --host=${HOST} --prefix=''
+    ./configure --build=${BUILD} --host=${HOST} --prefix=''
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/bash/recipe.sh b/recipes/bash/recipe.sh
index c9e8672a9..4479616c4 100644
--- a/recipes/bash/recipe.sh
+++ b/recipes/bash/recipe.sh
@@ -13,7 +13,7 @@ function recipe_update {
 
 function recipe_build {
     wget -O support/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-    ./configure --host=${HOST} --prefix=/ --disable-readline
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/ --disable-readline
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/cmatrix/recipe.sh b/recipes/cmatrix/recipe.sh
index 3dd1d835f..52522e692 100644
--- a/recipes/cmatrix/recipe.sh
+++ b/recipes/cmatrix/recipe.sh
@@ -16,7 +16,7 @@ function recipe_build {
     sysroot="$(realpath ../sysroot)"
     export LDFLAGS="-L$sysroot/lib"
     export CPPFLAGS="-I$sysroot/include"
-    ./configure --host=${HOST} --prefix=/ --without-fonts
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/ --without-fonts
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/curl/recipe.sh b/recipes/curl/recipe.sh
index 77e30965f..968a51c7d 100644
--- a/recipes/curl/recipe.sh
+++ b/recipes/curl/recipe.sh
@@ -19,6 +19,7 @@ function recipe_build {
     autoreconf -i
     ./configure \
         --prefix=/ \
+        --build=${BUILD} \
         --host=${HOST} \
         --disable-tftp \
         --disable-ftp \
diff --git a/recipes/dash/recipe.sh b/recipes/dash/recipe.sh
index fa1296ccc..37a0acebc 100644
--- a/recipes/dash/recipe.sh
+++ b/recipes/dash/recipe.sh
@@ -13,7 +13,7 @@ function recipe_update {
 
 function recipe_build {
     ./autogen.sh
-    ./configure --host=${HOST} --prefix=/
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/ cross_compiling=yes
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/diffutils/recipe.sh b/recipes/diffutils/recipe.sh
index 474e55df6..340e0815c 100644
--- a/recipes/diffutils/recipe.sh
+++ b/recipes/diffutils/recipe.sh
@@ -13,7 +13,7 @@ function recipe_update {
 
 function recipe_build {
     autoreconf
-    ./configure --host=${HOST} --prefix=/
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/dosbox/recipe.sh b/recipes/dosbox/recipe.sh
index d6771f160..dbf089410 100644
--- a/recipes/dosbox/recipe.sh
+++ b/recipes/dosbox/recipe.sh
@@ -19,7 +19,7 @@ function recipe_build {
     export LDFLAGS="-L$sysroot/lib"
     ./autogen.sh
     wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-    ./configure --host=${HOST} --prefix='' --disable-opengl --disable-sdltest --with-sdl-prefix="$sysroot"
+    ./configure --build=${BUILD} --host=${HOST} --prefix='' --disable-opengl --disable-sdltest --with-sdl-prefix="$sysroot"
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/expat/recipe.sh b/recipes/expat/recipe.sh
index e2277e783..d8f78f611 100644
--- a/recipes/expat/recipe.sh
+++ b/recipes/expat/recipe.sh
@@ -12,7 +12,7 @@ function recipe_update {
 }
 
 function recipe_build {
-    ./configure --host=${HOST} --prefix=/
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/freeciv/recipe.sh b/recipes/freeciv/recipe.sh
index 179707119..70765e96a 100644
--- a/recipes/freeciv/recipe.sh
+++ b/recipes/freeciv/recipe.sh
@@ -18,6 +18,7 @@ function recipe_build {
     export CFLAGS="-I$sysroot/include"
     export LDFLAGS="-L$sysroot/lib"
     ./configure \
+        --build=${BUILD} \
         --host="$HOST" \
         --prefix='' \
         --disable-server \
diff --git a/recipes/freetype/recipe.sh b/recipes/freetype/recipe.sh
index 5999cf0d1..ea6744f45 100644
--- a/recipes/freetype/recipe.sh
+++ b/recipes/freetype/recipe.sh
@@ -16,7 +16,7 @@ function recipe_build {
     sysroot="$(realpath ../sysroot)"
     export LDFLAGS="-L$sysroot/lib"
     export CPPFLAGS="-I$sysroot/include"
-    ./configure --host=${HOST} --prefix='/'
+    ./configure --build=${BUILD} --host=${HOST} --prefix='/'
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/gawk/recipe.sh b/recipes/gawk/recipe.sh
index 27de56946..98e4c08f9 100644
--- a/recipes/gawk/recipe.sh
+++ b/recipes/gawk/recipe.sh
@@ -8,7 +8,7 @@ function recipe_update {
 }
 
 function recipe_build {
-    ./configure --host=${HOST} --prefix=/ ac_cv_func_gethostbyname=no ac_cv_func_connect=no
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/ ac_cv_func_gethostbyname=no ac_cv_func_connect=no
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/gcc/recipe.sh b/recipes/gcc/recipe.sh
index b9715cf95..93a567e93 100644
--- a/recipes/gcc/recipe.sh
+++ b/recipes/gcc/recipe.sh
@@ -27,6 +27,7 @@ function recipe_build {
     ln -sf "$sysroot/lib" "$sysroot/usr/lib"
 
     ./configure \
+        --build=${BUILD} \
         --host=${HOST} \
         --target=${HOST} \
         --prefix=/ \
diff --git a/recipes/gettext/recipe.sh b/recipes/gettext/recipe.sh
index a1cd8445c..e19aa64c3 100644
--- a/recipes/gettext/recipe.sh
+++ b/recipes/gettext/recipe.sh
@@ -18,6 +18,7 @@ function recipe_build {
     export LDFLAGS="-L$sysroot/lib"
     wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
     ./configure \
+        --build=${BUILD} \
         --host=${HOST} \
         --prefix=/ \
         --disable-shared \
diff --git a/recipes/git/recipe.sh b/recipes/git/recipe.sh
index fe275cc59..1688d1c83 100644
--- a/recipes/git/recipe.sh
+++ b/recipes/git/recipe.sh
@@ -19,7 +19,7 @@ function recipe_build {
     sysroot="$(realpath ../sysroot)"
     export LDFLAGS="-L$sysroot/lib"
     export CPPFLAGS="-I$sysroot/include"
-    ./configure --host=${HOST} --prefix=/ ac_cv_fread_reads_directories=yes ac_cv_snprintf_returns_bogus=yes ac_cv_lib_curl_curl_global_init=yes CURL_CONFIG=no
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/ ac_cv_fread_reads_directories=yes ac_cv_snprintf_returns_bogus=yes ac_cv_lib_curl_curl_global_init=yes CURL_CONFIG=no
     make ${MAKEFLAGS} -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/glib/recipe.sh b/recipes/glib/recipe.sh
index fefd49116..cb9991f09 100644
--- a/recipes/glib/recipe.sh
+++ b/recipes/glib/recipe.sh
@@ -17,6 +17,7 @@ function recipe_build {
     export CFLAGS="-I$sysroot/include"
     export LDFLAGS="-L$sysroot/lib"
     glib_cv_stack_grows=no glib_cv_uscore=no ./autogen.sh \
+        --build=${BUILD} \
         --host=${HOST} \
         --prefix=/ \
         --disable-shared \
diff --git a/recipes/gnu-binutils/recipe.sh b/recipes/gnu-binutils/recipe.sh
index cae419df4..16c2b954d 100644
--- a/recipes/gnu-binutils/recipe.sh
+++ b/recipes/gnu-binutils/recipe.sh
@@ -17,7 +17,7 @@ function recipe_build {
     mkdir -p "$sysroot/usr"
     ln -sf "$sysroot/include" "$sysroot/usr/include"
     ln -sf "$sysroot/lib" "$sysroot/usr/lib"
-    ./configure --host=${HOST} --target=${HOST} --prefix=/ --with-sysroot=/ --with-build-sysroot="$sysroot" --disable-gdb --disable-nls --disable-werror
+    ./configure --build=${BUILD} --host=${HOST} --target=${HOST} --prefix=/ --with-sysroot=/ --with-build-sysroot="$sysroot" --disable-gdb --disable-nls --disable-werror
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/gnu-grep/recipe.sh b/recipes/gnu-grep/recipe.sh
index 3cf87f253..e45ebf0b4 100644
--- a/recipes/gnu-grep/recipe.sh
+++ b/recipes/gnu-grep/recipe.sh
@@ -12,7 +12,7 @@ function recipe_update {
 }
 
 function recipe_build {
-    ./configure --host=${HOST} --prefix=/
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/gnu-make/recipe.sh b/recipes/gnu-make/recipe.sh
index 7040db16e..523b32e97 100644
--- a/recipes/gnu-make/recipe.sh
+++ b/recipes/gnu-make/recipe.sh
@@ -12,7 +12,7 @@ function recipe_update {
 }
 
 function recipe_build {
-    ./configure --host=${HOST} --prefix=/ CFLAGS="-DPOSIX -DNO_ARCHIVES -DNO_OUTPUT_SYNC" --without-guile
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/ CFLAGS="-DPOSIX -DNO_ARCHIVES -DNO_OUTPUT_SYNC" --without-guile
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/gstreamer/recipe.sh b/recipes/gstreamer/recipe.sh
index 2b6c1dad8..370edb7f4 100644
--- a/recipes/gstreamer/recipe.sh
+++ b/recipes/gstreamer/recipe.sh
@@ -19,6 +19,7 @@ function recipe_build {
     export GLIB_GENMARSHAL="$(which glib-genmarshal)"
     export GLIB_MKENUMS="$(which glib-mkenums)"
     ./configure \
+        --build=${BUILD} \
         --host=${HOST} \
         --prefix=/ \
         --disable-shared \
diff --git a/recipes/harfbuzz/recipe.sh b/recipes/harfbuzz/recipe.sh
index 06f617b3b..0f8a4ba04 100644
--- a/recipes/harfbuzz/recipe.sh
+++ b/recipes/harfbuzz/recipe.sh
@@ -20,6 +20,7 @@ function recipe_build {
     FREETYPE_CFLAGS="$("${PKG_CONFIG}" --cflags freetype2)"
     FREETYPE_LIBS="$("${PKG_CONFIG}" --libs freetype2)"
     ./configure \
+        --build=${BUILD} \
         --host=${HOST} \
         --prefix=/ \
         --disable-shared \
diff --git a/recipes/jansson/recipe.sh b/recipes/jansson/recipe.sh
index 82799a01c..9cd618aa5 100644
--- a/recipes/jansson/recipe.sh
+++ b/recipes/jansson/recipe.sh
@@ -15,7 +15,7 @@ function recipe_build {
     sysroot="$(realpath ../sysroot)"
     export LDFLAGS="-L$sysroot/lib"
     export CPPFLAGS="-I$sysroot/include"
-    ./configure --host=${HOST} --prefix=/
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/libffi/recipe.sh b/recipes/libffi/recipe.sh
index 111c20252..ef6b3dbfb 100644
--- a/recipes/libffi/recipe.sh
+++ b/recipes/libffi/recipe.sh
@@ -18,6 +18,7 @@ function recipe_build {
     export LDFLAGS="-L$sysroot/lib"
     wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
     ./configure \
+        --build=${BUILD} \
         --host=${HOST} \
         --prefix=/ \
         --disable-shared \
diff --git a/recipes/libiconv/recipe.sh b/recipes/libiconv/recipe.sh
index da36d9f6c..6f1cedaba 100644
--- a/recipes/libiconv/recipe.sh
+++ b/recipes/libiconv/recipe.sh
@@ -12,7 +12,7 @@ function recipe_update {
 }
 
 function recipe_build {
-    ./configure --host=${HOST} --prefix='/' --disable-shared --enable-static
+    ./configure --build=${BUILD} --host=${HOST} --prefix='/' --disable-shared --enable-static
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/libjpeg/recipe.sh b/recipes/libjpeg/recipe.sh
index 5db06702b..b476840be 100644
--- a/recipes/libjpeg/recipe.sh
+++ b/recipes/libjpeg/recipe.sh
@@ -12,7 +12,7 @@ function recipe_update {
 }
 
 function recipe_build {
-    ./configure --host=${HOST} --prefix='/'
+    ./configure --build=${BUILD} --host=${HOST} --prefix='/'
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/libpng/recipe.sh b/recipes/libpng/recipe.sh
index 0d7f16ca9..224557ffe 100644
--- a/recipes/libpng/recipe.sh
+++ b/recipes/libpng/recipe.sh
@@ -18,7 +18,7 @@ function recipe_build {
     export CPPFLAGS="-I$sysroot/include"
     chmod +w config.sub
     wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-    ./configure --host=${HOST} --prefix='/'
+    ./configure --build=${BUILD} --host=${HOST} --prefix='/'
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/libsodium/recipe.sh b/recipes/libsodium/recipe.sh
index b51660778..ce7a4c821 100644
--- a/recipes/libsodium/recipe.sh
+++ b/recipes/libsodium/recipe.sh
@@ -12,9 +12,8 @@ function recipe_update {
 }
 
 function recipe_build {
-    # Disclaimer: No idea what I'm doing
     ./autogen.sh
-    ./configure --host=${HOST} --prefix='/'
+    ./configure --build=${BUILD} --host=${HOST} --prefix='/'
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/mesa/recipe.sh b/recipes/mesa/recipe.sh
index d1e8941f8..861cb33a1 100644
--- a/recipes/mesa/recipe.sh
+++ b/recipes/mesa/recipe.sh
@@ -21,6 +21,7 @@ function recipe_build {
     #export LLVM_CONFIG="x86_64-unknown-redox-llvm-config"
     NOCONFIGURE=1 ./autogen.sh
     ./configure \
+        --build=${BUILD} \
         --host="${HOST}" \
         --prefix=/ \
         --disable-dri \
diff --git a/recipes/mesa_glu/recipe.sh b/recipes/mesa_glu/recipe.sh
index b93a7dbd7..5bb291134 100644
--- a/recipes/mesa_glu/recipe.sh
+++ b/recipes/mesa_glu/recipe.sh
@@ -18,7 +18,7 @@ function recipe_build {
     export CPPFLAGS="-I$sysroot/include"
     export LDFLAGS="-L$sysroot/lib"
     wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-    ./configure --host="${HOST}" --prefix=/ --enable-osmesa
+    ./configure --build=${BUILD} --host="${HOST}" --prefix=/ --enable-osmesa
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/nasm/recipe.sh b/recipes/nasm/recipe.sh
index de7fa3749..f2947f2ec 100644
--- a/recipes/nasm/recipe.sh
+++ b/recipes/nasm/recipe.sh
@@ -12,7 +12,7 @@ function recipe_update {
 }
 
 function recipe_build {
-    ./configure --host=${HOST} --prefix=""
+    ./configure --build=${BUILD} --host=${HOST} --prefix=""
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/ncdu/recipe.sh b/recipes/ncdu/recipe.sh
index 26a9a8bbf..b59c0a69c 100644
--- a/recipes/ncdu/recipe.sh
+++ b/recipes/ncdu/recipe.sh
@@ -16,7 +16,7 @@ function recipe_build {
     export LDFLAGS="-L$sysroot/lib"
     export CPPFLAGS="-I$sysroot/include -I$sysroot/include/ncurses"
     ./configure \
-        --build x86_64-pc-linux-gnu \
+        --build=${BUILD} \
         --host "$HOST"
     make -j"$(nproc)"
     skip=1
diff --git a/recipes/ncurses/recipe.sh b/recipes/ncurses/recipe.sh
index dda9affda..493572db6 100644
--- a/recipes/ncurses/recipe.sh
+++ b/recipes/ncurses/recipe.sh
@@ -14,6 +14,7 @@ function recipe_update {
 
 function recipe_build {
     ./configure \
+        --build=${BUILD} \
         --host=${HOST} \
         --prefix="" \
         --disable-db-install \
diff --git a/recipes/ncursesw/recipe.sh b/recipes/ncursesw/recipe.sh
index 3af5af5b7..e2ab53f4f 100644
--- a/recipes/ncursesw/recipe.sh
+++ b/recipes/ncursesw/recipe.sh
@@ -14,7 +14,7 @@ function recipe_update {
 
 function recipe_build {
     export CPPFLAGS="-P"
-    ./configure --host=${HOST} --prefix="" --enable-widec --disable-db-install
+    ./configure --build=${BUILD} --host=${HOST} --prefix="" --enable-widec --disable-db-install
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/newlib/recipe.sh b/recipes/newlib/recipe.sh
index 979fb8ccf..36e79bd4e 100644
--- a/recipes/newlib/recipe.sh
+++ b/recipes/newlib/recipe.sh
@@ -24,7 +24,7 @@ function recipe_build {
         automake-1.11 --cygnus Makefile
     popd
 
-    CC= ./configure --target="${HOST}" --prefix=/
+    CC= ./configure --build=${BUILD} --target="${HOST}" --prefix=/
     make all -j"$(nproc)"
 
     skip=1
diff --git a/recipes/openjazz/recipe.sh b/recipes/openjazz/recipe.sh
index 39d280857..5eb28453a 100644
--- a/recipes/openjazz/recipe.sh
+++ b/recipes/openjazz/recipe.sh
@@ -21,7 +21,7 @@ function recipe_build {
     autoreconf -fvi
     autoconf
     wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-    ./configure --host=${HOST} --prefix=''
+    ./configure --build=${BUILD} --host=${HOST} --prefix=''
     make -j"$(nproc)" V=1
     skip=1
 }
diff --git a/recipes/openttd/recipe.sh b/recipes/openttd/recipe.sh
index f0c9d2329..ba6452407 100644
--- a/recipes/openttd/recipe.sh
+++ b/recipes/openttd/recipe.sh
@@ -15,7 +15,7 @@ function recipe_update {
 
 function recipe_build {
     ./configure \
-        --build=`gcc -dumpmachine` \
+        --build=${BUILD} \
         --host=${HOST} \
         --prefix='' \
         --enable-static \
diff --git a/recipes/patch/recipe.sh b/recipes/patch/recipe.sh
index 52d8934d9..20e62b203 100644
--- a/recipes/patch/recipe.sh
+++ b/recipes/patch/recipe.sh
@@ -14,7 +14,7 @@ function recipe_update {
 function recipe_build {
     wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
     autoreconf
-    ./configure --host=${HOST} --prefix=/
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/pcre/recipe.sh b/recipes/pcre/recipe.sh
index 2e0e8e8cb..62a3aa6a9 100644
--- a/recipes/pcre/recipe.sh
+++ b/recipes/pcre/recipe.sh
@@ -17,6 +17,7 @@ function recipe_build {
     export CFLAGS="-I$sysroot/include"
     export LDFLAGS="-L$sysroot/lib"
     ./configure \
+        --build=${BUILD} \
         --host=${HOST} \
         --prefix=/ \
         --disable-shared \
diff --git a/recipes/perl/recipe.sh b/recipes/perl/recipe.sh
index 0d3f6f102..b4bd646af 100644
--- a/recipes/perl/recipe.sh
+++ b/recipes/perl/recipe.sh
@@ -18,7 +18,7 @@ function recipe_build {
     tar --strip-components=1 -xvf perl-cross-1.1.6.tar.gz
     wget -O cnf/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
     sysroot="$($HOST-gcc -print-sysroot)"
-    ./configure --target=${HOST} --prefix='/' --sysroot="$sysroot" --disable-mod=Sys-Syslog,Time-HiRes --with-libs='m'
+    ./configure --build=${BUILD} --target=${HOST} --prefix='/' --sysroot="$sysroot" --disable-mod=Sys-Syslog,Time-HiRes --with-libs='m'
     sed -i "s/^#define Netdb_name_t.*/#define Netdb_name_t const char*/" config.h # XXX
     sed -i 's/#define Strerror(e).*$/#define Strerror(e) strerror(e)/' config.h #
     echo "#define HAS_VPRINTF" >> config.h
diff --git a/recipes/pixman/recipe.sh b/recipes/pixman/recipe.sh
index 617827dc7..708a2f711 100755
--- a/recipes/pixman/recipe.sh
+++ b/recipes/pixman/recipe.sh
@@ -14,10 +14,11 @@ function recipe_update {
 function recipe_build {
 	sysroot="$(realpath ../sysroot)"
 	./configure \
-		--host=${HOST} \
-		--prefix=/ \
-		--disable-shared \
-		--enable-static
+            --build=${BUILD} \
+            --host=${HOST} \
+            --prefix=/ \
+            --disable-shared \
+            --enable-static
 	make -j"$(nproc)"
 	skip=1
 }
diff --git a/recipes/prboom/recipe.sh b/recipes/prboom/recipe.sh
index 6f3a5a026..3419878bc 100644
--- a/recipes/prboom/recipe.sh
+++ b/recipes/prboom/recipe.sh
@@ -16,7 +16,7 @@ function recipe_build {
     sysroot="$(realpath ../sysroot)"
     autoreconf -if
     wget -O autotools/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-    ./configure --prefix=/ --host=${HOST} --disable-sdltest --disable-cpu-opt --disable-gl --without-net --with-sdl-prefix="$sysroot"
+    ./configure --prefix=/ --build=${BUILD} --host=${HOST} --disable-sdltest --disable-cpu-opt --disable-gl --without-net --with-sdl-prefix="$sysroot"
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh
index 3f3643db7..ed96cb55b 100644
--- a/recipes/python/recipe.sh
+++ b/recipes/python/recipe.sh
@@ -15,7 +15,7 @@ function recipe_update {
 
 function recipe_build {
     cp ../config.site ./
-    ./configure --host=${HOST} --build=${ARCH} --prefix=/
+    ./configure --build=${BUILD} --host=${HOST} --build=${ARCH} --prefix=/
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/qemu/recipe.sh b/recipes/qemu/recipe.sh
index 76d854ed2..3bb11eb74 100644
--- a/recipes/qemu/recipe.sh
+++ b/recipes/qemu/recipe.sh
@@ -18,6 +18,7 @@ function recipe_build {
     export CPPFLAGS="-I$sysroot/include"
     export LDFLAGS="-L$sysroot/lib"
     ./configure \
+        --build=${BUILD} \
         --host="${HOST}" \
         --prefix=/
     make -j"$(nproc)"
diff --git a/recipes/readline/recipe.sh b/recipes/readline/recipe.sh
index c13c1dacb..d082c0b9c 100644
--- a/recipes/readline/recipe.sh
+++ b/recipes/readline/recipe.sh
@@ -16,7 +16,7 @@ function recipe_build {
     sysroot="$(realpath ../sysroot)"
     export LDFLAGS="-L$sysroot/lib"
     export CFLAGS="-I$sysroot/include"
-    ./configure --disable-shared --host=${HOST} --prefix=""
+    ./configure --disable-shared --build=${BUILD} --host=${HOST} --prefix=""
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/schismtracker/recipe.sh b/recipes/schismtracker/recipe.sh
index e9fa3a283..92e52eb34 100644
--- a/recipes/schismtracker/recipe.sh
+++ b/recipes/schismtracker/recipe.sh
@@ -19,7 +19,7 @@ function recipe_build {
     export LDFLAGS="-L$sysroot/lib"
     export SDL_CONFIG="$sysroot/bin/sdl-config"
     autoreconf -i
-    ./configure --host=${HOST} --prefix=''
+    ./configure --build=${BUILD} --host=${HOST} --prefix=''
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/scummvm/recipe.sh b/recipes/scummvm/recipe.sh
index 582a42d5d..938b80ad9 100644
--- a/recipes/scummvm/recipe.sh
+++ b/recipes/scummvm/recipe.sh
@@ -18,6 +18,7 @@ function recipe_build {
     sysroot="$(realpath ../sysroot)"
 
     ./configure \
+        --build=${BUILD} \
         --host=${HOST} \
         --prefix='' \
         --with-sdl-prefix="$sysroot" \
diff --git a/recipes/sdl/recipe.sh b/recipes/sdl/recipe.sh
index 83b58ee34..0d9aaed29 100644
--- a/recipes/sdl/recipe.sh
+++ b/recipes/sdl/recipe.sh
@@ -18,6 +18,7 @@ function recipe_build {
     export LDFLAGS="-L$sysroot/lib"
     ./autogen.sh
     ./configure \
+        --build=${BUILD} \
         --host=${HOST} \
         --prefix=/ \
         --disable-shared \
diff --git a/recipes/sdl2/recipe.sh b/recipes/sdl2/recipe.sh
index f17533eaa..cbb8f567d 100644
--- a/recipes/sdl2/recipe.sh
+++ b/recipes/sdl2/recipe.sh
@@ -18,6 +18,7 @@ function recipe_build {
     export LDFLAGS="-L$sysroot/lib"
     ./autogen.sh
     ./configure \
+        --build=${BUILD} \
         --host=${HOST} \
         --prefix=/ \
         --disable-shared \
diff --git a/recipes/sdl_gfx/recipe.sh b/recipes/sdl_gfx/recipe.sh
index bf0e63177..9a697f918 100644
--- a/recipes/sdl_gfx/recipe.sh
+++ b/recipes/sdl_gfx/recipe.sh
@@ -17,7 +17,7 @@ function recipe_build {
     export CFLAGS="-I$sysroot/include"
     export LDFLAGS="-L$sysroot/lib"
     ./autogen.sh
-    ./configure --prefix=/ --host=${HOST} --disable-shared --disable-sdltest
+    ./configure --prefix=/ --build=${BUILD} --host=${HOST} --disable-shared --disable-sdltest
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/sdl_image/recipe.sh b/recipes/sdl_image/recipe.sh
index 75c6f2c6b..c7eefdd7f 100644
--- a/recipes/sdl_image/recipe.sh
+++ b/recipes/sdl_image/recipe.sh
@@ -17,7 +17,7 @@ function recipe_build {
     export CFLAGS="-I$sysroot/include"
     export LDFLAGS="-L$sysroot/lib"
     ./autogen.sh
-    ./configure --prefix=/ --host=${HOST} --disable-shared --disable-sdltest --enable-png --enable-jpg
+    ./configure --prefix=/ --build=${BUILD} --host=${HOST} --disable-shared --disable-sdltest --enable-png --enable-jpg
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/sdl_mixer/recipe.sh b/recipes/sdl_mixer/recipe.sh
index 12b3b4e87..cf4ccfc48 100644
--- a/recipes/sdl_mixer/recipe.sh
+++ b/recipes/sdl_mixer/recipe.sh
@@ -19,6 +19,7 @@ function recipe_build {
     ./autogen.sh
     ./configure \
         --prefix=/ \
+        --build=${BUILD} \
         --host=${HOST} \
         --disable-shared \
         --disable-sdltest \
diff --git a/recipes/sdl_ttf/recipe.sh b/recipes/sdl_ttf/recipe.sh
index 2fbc04b17..44dfbedfb 100644
--- a/recipes/sdl_ttf/recipe.sh
+++ b/recipes/sdl_ttf/recipe.sh
@@ -17,7 +17,7 @@ function recipe_build {
     export CFLAGS="-I$sysroot/include"
     export LDFLAGS="-L$sysroot/lib"
     ./autogen.sh
-    ./configure --prefix=/ --host=${HOST} --disable-shared --disable-sdltest
+    ./configure --prefix=/ --build=${BUILD} --host=${HOST} --disable-shared --disable-sdltest
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/sed/recipe.sh b/recipes/sed/recipe.sh
index c1de02482..1dce07714 100644
--- a/recipes/sed/recipe.sh
+++ b/recipes/sed/recipe.sh
@@ -12,7 +12,7 @@ function recipe_update {
 }
 
 function recipe_build {
-    ./configure --host=${HOST} --prefix=/
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/sopwith/recipe.sh b/recipes/sopwith/recipe.sh
index eddace877..744950736 100644
--- a/recipes/sopwith/recipe.sh
+++ b/recipes/sopwith/recipe.sh
@@ -18,7 +18,7 @@ function recipe_build {
     export CFLAGS="-I$sysroot/include -I$sysroot/include/SDL"
     export LDFLAGS="-L$sysroot/lib"
     export LIBS="-lSDL -lorbital" # TODO: Uses sdl-config instead of pkg-config
-    ./configure --host=${HOST} --prefix='' --with-sdl-prefix="$sysroot"
+    ./configure --build=${BUILD} --host=${HOST} --prefix='' --with-sdl-prefix="$sysroot"
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/ssh/recipe.sh b/recipes/ssh/recipe.sh
index 576b4b9e6..f21368363 100644
--- a/recipes/ssh/recipe.sh
+++ b/recipes/ssh/recipe.sh
@@ -16,7 +16,7 @@ function recipe_build {
     sysroot="$(realpath ../sysroot)"
     export LDFLAGS="-L$sysroot/lib"
     export CPPFLAGS="-I$sysroot/include"
-    ./configure --host=${HOST} --prefix=/
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/
     make -j$(nproc)
     skip=1
 }
diff --git a/recipes/timidity/recipe.sh b/recipes/timidity/recipe.sh
index bd905cd58..c10b7fee4 100644
--- a/recipes/timidity/recipe.sh
+++ b/recipes/timidity/recipe.sh
@@ -16,7 +16,7 @@ function recipe_update {
 function recipe_build {
     autoreconf -f -i
     wget -O autoconf/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-    ./configure --host=${HOST} --prefix='' --enable-vt100
+    ./configure --build=${BUILD} --host=${HOST} --prefix='' --enable-vt100
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/vim/recipe.sh b/recipes/vim/recipe.sh
index 98623b57b..afc09c279 100644
--- a/recipes/vim/recipe.sh
+++ b/recipes/vim/recipe.sh
@@ -23,7 +23,7 @@ function recipe_build {
     export vim_cv_getcwd_broken=yes
     export vim_cv_stat_ignores_slash=no
     export vim_cv_memmove_handles_overlap=yes
-    ./configure --host=${HOST} --prefix=/ --with-tlib=ncurses
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/ --with-tlib=ncurses
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/vttest/recipe.sh b/recipes/vttest/recipe.sh
index 59adc9343..b1147b68b 100644
--- a/recipes/vttest/recipe.sh
+++ b/recipes/vttest/recipe.sh
@@ -13,7 +13,7 @@ function recipe_update {
 
 function recipe_build {
     wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-    ./configure --host=${HOST} --prefix=''
+    ./configure --build=${BUILD} --host=${HOST} --prefix=''
     make -j"$(nproc)"
     skip=1
 }
diff --git a/recipes/xz/recipe.sh b/recipes/xz/recipe.sh
index 0a643b03f..e1221711b 100644
--- a/recipes/xz/recipe.sh
+++ b/recipes/xz/recipe.sh
@@ -15,7 +15,7 @@ function recipe_build {
     ./autogen.sh
     chmod +w build-aux/config.sub
     wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-    ./configure --host=${HOST} --prefix=/ --enable-threads=no
+    ./configure --build=${BUILD} --host=${HOST} --prefix=/ --enable-threads=no
     make -j"$(nproc)"
     skip=1
 }
-- 
GitLab