5 files changed, 24 insertions, 2 deletions
diff --git a/contrib/lame/module.defs b/contrib/lame/module.defs
index b6bca0f70..400146781 100644
--- a/contrib/lame/module.defs
+++ b/contrib/lame/module.defs
@@ -8,3 +8,7 @@ LAME.FETCH.sha256  = 24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9
 ifneq (none,$(FFMPEG.GCC.g))
 	LAME.CONFIGURE.extra += --enable-debug
 endif
+
+ifeq (1-msys,$(BUILD.cross)-$(HOST.system))
+    LAME.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu
+endif
diff --git a/contrib/libiconv/module.defs b/contrib/libiconv/module.defs
index 4b2d9fbac..9c645cc38 100644
--- a/contrib/libiconv/module.defs
+++ b/contrib/libiconv/module.defs
@@ -5,7 +5,13 @@ LIBICONV.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libicon
 LIBICONV.FETCH.url    += https://ftp.gnu.org/gnu/libiconv/libiconv-1.15.tar.gz
 LIBICONV.FETCH.sha256  = ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178
 
+ifeq (1,$(BUILD.cross))
 # this contrib will not build under MinGW with -std=gnu99
-ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
-    LIBICONV.GCC.args.c_std = -std=gnu89
+    ifeq (mingw,$(BUILD.system))
+        LIBICONV.GCC.args.c_std = -std=gnu89
+    endif
+
+    ifeq (msys,$(HOST.system))
+        LIBICONV.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu
+    endif
 endif
diff --git a/contrib/libsamplerate/module.defs b/contrib/libsamplerate/module.defs
index f4c4555d4..cba9eea5e 100644
--- a/contrib/libsamplerate/module.defs
+++ b/contrib/libsamplerate/module.defs
@@ -11,3 +11,7 @@ LIBSAMPLERATE.EXTRACT.tarbase = libsamplerate
 
 # Disable to avoid Carbon.h dependency on OSX
 LIBSAMPLERATE.CONFIGURE.extra = --disable-sndfile
+
+ifeq (1-msys,$(BUILD.cross)-$(HOST.system))
+    LIBSAMPLERATE.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu
+endif
diff --git a/contrib/libtheora/module.defs b/contrib/libtheora/module.defs
index 9563ba31b..5e4fb57c3 100644
--- a/contrib/libtheora/module.defs
+++ b/contrib/libtheora/module.defs
@@ -14,3 +14,7 @@ LIBTHEORA.CONFIGURE.extra = \
     --with-ogg=$(call fn.ABSOLUTE,$(CONTRIB.build/)) \
     --with-vorbis=$(call fn.ABSOLUTE,$(CONTRIB.build/)) \
     HAVE_PKG_CONFIG=no
+
+ifeq (1-msys,$(BUILD.cross)-$(HOST.system))
+    LIBTHEORA.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu
+endif
diff --git a/contrib/libxml2/module.defs b/contrib/libxml2/module.defs
index e4f1755b8..bf17500d9 100644
--- a/contrib/libxml2/module.defs
+++ b/contrib/libxml2/module.defs
@@ -10,3 +10,7 @@ LIBXML2.FETCH.sha256  = ffb911191e509b966deb55de705387f14156e1a56b21824357cdf005
 # in the MinGW environment.
 LIBXML2.CONFIGURE.extra = \
     --without-python --without-threads
+
+ifeq (1-msys,$(BUILD.cross)-$(HOST.system))
+    LIBXML2.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu
+endif