[vlc-commits] win32: build.sh: Fix breakpad activation

Hugo Beauzée-Luyssen git at videolan.org
Wed Dec 27 12:00:36 CET 2017


vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Dec 27 12:00:32 2017 +0100| [4fd66271d58b00c8056f96309bda80b67763b3a8] | committer: Hugo Beauzée-Luyssen

win32: build.sh: Fix breakpad activation

(cherry picked from commit 6812104e4053cc48e04ab3406efd6038fc0c162f)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

 extras/package/win32/build.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
index cd305442b4..220321015c 100755
--- a/extras/package/win32/build.sh
+++ b/extras/package/win32/build.sh
@@ -95,7 +95,10 @@ cd ../../
 info "Building contribs"
 export USE_FFMPEG=1
 mkdir -p contrib/contrib-$SHORTARCH && cd contrib/contrib-$SHORTARCH
-../bootstrap --host=$TRIPLET
+if [ ! -z "$BREAKPAD" ]; then
+     CONTRIBFLAGS="$CONTRIBFLAGS --enable-breakpad"
+fi
+../bootstrap --host=$TRIPLET $CONTRIBFLAGS
 
 # Rebuild the contribs or use the prebuilt ones
 if [ "$PREBUILT" != "yes" ]; then
@@ -116,10 +119,7 @@ export PKG_CONFIG_LIBDIR=$PWD/contrib/$TRIPLET/lib/pkgconfig
 export PATH=$PWD/contrib/$TRIPLET/bin:$PATH
 echo $PATH
 
-if [ ! -z "$BREAKPAD" ]; then
-     CONFIGFLAGS="$CONFIGFLAGS --with-breakpad=$BREAKPAD"
-fi
-./bootstrap $CONTRIBFLAGS
+./bootstrap
 
 info "Configuring VLC"
 mkdir $SHORTARCH || true



More information about the vlc-commits mailing list