[vlc-devel] [PATCH v2] package/win32: Force libtool build when using llvm-mingw

[Steve Lhomme]

LGTM

On 2019-10-15 16:19, Marvin Scholz wrote:
> The libtool in extras/tools has additional patches that are needed to
> build with llvm-mingw.
> ---
>   extras/package/win32/build.sh | 13 ++++++++++++-
>   1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
> index 0033265a1b..94615a7814 100755
> --- a/extras/package/win32/build.sh
> +++ b/extras/package/win32/build.sh
> @@ -96,11 +96,22 @@ esac
>   : ${JOBS:=$(getconf _NPROCESSORS_ONLN 2>&1)}
>   TRIPLET=$ARCH-w64-mingw32
>   
> +# Check if compiling with clang
> +CC=${CC:-$TRIPLET-gcc}
> +if ! printf "#ifdef __clang__\n#error CLANG\n#endif" | $CC -E -; then
> +    COMPILING_WITH_CLANG=1
> +fi
> +
>   info "Building extra tools"
>   cd extras/tools
> +
> +# Force libtool build when compiling with clang
> +if [ "$COMPILING_WITH_CLANG" -gt 0 ] && [ ! -d "libtool" ]; then
> +    FORCED_TOOLS="libtool"
> +fi
>   # bootstrap only if needed in interactive mode
>   if [ "$INTERACTIVE" != "yes" ] || [ ! -f ./Makefile ]; then
> -    ./bootstrap
> +    NEEDED="$FORCED_TOOLS" ./bootstrap
>   fi
>   make -j$JOBS
>   export PATH="$PWD/build/bin":"$PATH"
> -- 
> 2.20.1 (Apple Git-117)
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>