[vlc-commits] contribs: bootstrap: make uname output silent if -o is not supported.

Konstantin Pavlov git at videolan.org
Sat Dec 9 12:38:30 CET 2017


vlc/vlc-3.0 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Sat Dec  9 14:34:59 2017 +0300| [7b3bde1ea61b2976e178da24afce2e51b19d14e7] | committer: Konstantin Pavlov

contribs: bootstrap: make uname output silent if -o is not supported.

(cherry picked from commit 3fb8103c33e1ae60dced8c4f475bfa21e1195ad9)
Signed-off-by: Konstantin Pavlov <thresh at videolan.org>

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

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

diff --git a/contrib/bootstrap b/contrib/bootstrap
index dbb0e27545..20ce524926 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -286,7 +286,7 @@ test -z "$GPL" || add_make_enabled "GPL"
 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 "`uname -o`" != "Msys" || add_make "CMAKE_GENERATOR := -G \"MSYS Makefiles\""
+test "`uname -o 2>/dev/null`" != "Msys" || add_make "CMAKE_GENERATOR := -G \"MSYS Makefiles\""
 
 #
 # Checks



More information about the vlc-commits mailing list