[vlc-devel] [PATCH 3.0.x] contrib: force cmake generator to makefile

[Zhao Zhili]

VLC 3.0 branch doesn't support cmake generator other than makefile.
If user set the generator via environment vairable, it will break
the build.
---
 contrib/bootstrap | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 980b1f9e49..69d9f684d0 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -287,7 +287,12 @@ test -z "$GNUV3" || add_make_enabled "GNUV3"
 test -z "$AD_CLAUSES" || add_make_enabled "AD_CLAUSES"
 test -z "$WITH_OPTIMIZATION" || add_make_enabled "WITH_OPTIMIZATION"
 test -z "$ENABLE_PDB" || add_make_enabled "ENABLE_PDB"
-test "`uname -o 2>/dev/null`" != "Msys" || add_make "CMAKE_GENERATOR := -G \"MSYS Makefiles\""
+
+if [ "`uname -o 2>/dev/null`" = "Msys" ]; then
+    add_make "CMAKE_GENERATOR := -G \"MSYS Makefiles\""
+else
+    add_make "CMAKE_GENERATOR := -G \"Unix Makefiles\""
+fi
 
 #
 # Checks
-- 
2.28.0