Commit 0a9c2962 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

vlc-debian-llvm-mingw: Use correct C++ ABI for sanitizers

Updating from the upstream repo
parent 7bfcf658
Pipeline #37383 failed with stage
in 50 minutes and 43 seconds
......@@ -2,7 +2,7 @@ FROM debian:sid-20201012-slim
MAINTAINER VideoLAN roots <roots@videolan.org>
ENV IMAGE_DATE=202011071103
ENV IMAGE_DATE=202011121119
RUN apt-get update -qq && mkdir -p /usr/share/man/man1 && \
apt-get upgrade -y && \
......
......@@ -119,6 +119,7 @@ for arch in $ARCHS; do
-DCMAKE_C_COMPILER_TARGET=$buildarchname-windows-gnu \
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=TRUE \
-DCOMPILER_RT_USE_BUILTINS_LIBRARY=TRUE \
-DSANITIZER_CXX_ABI=libc++ \
$SRC_DIR
$BUILDCMD ${CORES+-j$CORES}
mkdir -p "$PREFIX/lib/clang/$CLANG_VERSION/lib/windows"
......
......@@ -22,7 +22,7 @@ if [ $# -lt 1 ]; then
fi
MAKE=make
if [ "$(which gmake)" != "" ]; then
if [ -n "$(which gmake)" ]; then
MAKE=gmake
fi
......
......@@ -49,7 +49,7 @@ fi
cd mingw-w64
MAKE=make
if [ "$(which gmake)" != "" ]; then
if [ -n "$(which gmake)" ]; then
MAKE=gmake
fi
......
......@@ -62,7 +62,7 @@ fi
[ -z "$CHECKOUT_ONLY" ] || exit 0
MAKE=make
if [ "$(which gmake)" != "" ]; then
if [ -n "$(which gmake)" ]; then
MAKE=gmake
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment