[vlc-commits] contrib: Treat windows-gnu as an alias for mingw32

Martin Storsjö git at videolan.org
Tue Nov 6 13:35:48 CET 2018


vlc | branch: master | Martin Storsjö <martin at martin.st> | Wed Oct 10 13:12:10 2018 +0300| [f864e591455f44260836828d8236fa3363e0e2a4] | committer: Martin Storsjö

contrib: Treat windows-gnu as an alias for mingw32

LLVM internally normalizes the "mingw32" part of a triplet into
windows-gnu, and when detecting the toolchain with $CC -dumpmachine,
this wouldn't match the rest of contribs' rules for detecting a
supported windows environment.

This allows building contribs with llvm-mingw as the native compiler.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f864e591455f44260836828d8236fa3363e0e2a4
---

 contrib/bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index e404d8ae90..763a136fe0 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -120,7 +120,7 @@ fi
 if test -z "$BUILD"
 then
 	echo -n "Guessing build system... "
-	BUILD="`${CC:-cc} -dumpmachine`"
+	BUILD="`${CC:-cc} -dumpmachine | sed s/windows-gnu/mingw32/`"
 	if test -z "$BUILD"; then
 		echo "FAIL!"
 		exit 1



More information about the vlc-commits mailing list