vlc | branch: master | David Fuhrmann <[email protected]> | Sat Dec 29 12:16:52 2018 +0100| [3b9f2b4fbdb7358dae99c9b1460b5802ff90c14d] | committer: David Fuhrmann
macOS build.sh: Fix make clean for contribs If an old contrib folder exists, bootstrap recognizes those as "system-available" libraries and thus does not recompile. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3b9f2b4fbdb7358dae99c9b1460b5802ff90c14d --- extras/package/macosx/build.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh index 48839c18ca..57325e04fa 100755 --- a/extras/package/macosx/build.sh +++ b/extras/package/macosx/build.sh @@ -145,11 +145,14 @@ vlcSetContribEnvironment "$MINIMAL_OSX_VERSION" info "Building contribs" spushd "${vlcroot}/contrib" -mkdir -p contrib-$TRIPLET && cd contrib-$TRIPLET -../bootstrap --build=$TRIPLET --host=$TRIPLET > $out + if [ "$REBUILD" = "yes" ]; then - make clean + rm -rf contrib-$TRIPLET + rm -rf $TRIPLET fi +mkdir -p contrib-$TRIPLET && cd contrib-$TRIPLET +../bootstrap --build=$TRIPLET --host=$TRIPLET > $out + if [ "$CONTRIBFROMSOURCE" = "yes" ]; then make fetch make -j$JOBS .gettext _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
