vlc/vlc-3.0 | branch: master | Martin Storsjö <[email protected]> | Wed Oct 10 
13:12:10 2018 +0300| [4d6e4922290513eae620dd7089969cea25e9f46c] | committer: 
Steve Lhomme

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.

(cherry picked from commit f864e591455f44260836828d8236fa3363e0e2a4)
Signed-off-by: Steve Lhomme <[email protected]>

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

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

diff --git a/contrib/bootstrap b/contrib/bootstrap
index b7cab040a5..611912a14a 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

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to