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

vlc-debian-llvm-mingw: Update from upstream

parent 96cfc53e
......@@ -2,7 +2,7 @@
#
FROM registry.videolan.org:5000/videolan-base-sid:20181128112333
ENV IMAGE_DATE=201812131007
ENV IMAGE_DATE=201901101117
RUN apt-get update -qq && apt-get install -qqy \
git wget bzip2 file unzip libtool pkg-config cmake build-essential \
......@@ -53,7 +53,7 @@ RUN ./build-mingw-w64.sh $TOOLCHAIN_PREFIX && \
rm -rf /build/*
# Build libunwind/libcxxabi/libcxx
COPY build-libcxx.sh merge-archives.sh ./
COPY build-libcxx.sh ./
RUN ./build-libcxx.sh $TOOLCHAIN_PREFIX && \
rm -rf /build/*
......
......@@ -49,7 +49,7 @@ fi
if [ -n "$SYNC" ] || [ -n "$CHECKOUT_LIBUNWIND" ]; then
cd libunwind
[ -z "$SYNC" ] || git fetch
git checkout 03a10740898eeb2b0c7a7c6bea3e293a221309a1
git checkout 9defb52f575beff21b646e60e63f72ad1ac7cf54
cd ..
fi
if [ -n "$SYNC" ] || [ -n "$CHECKOUT_LIBCXXABI" ]; then
......@@ -66,7 +66,6 @@ if [ -n "$SYNC" ] || [ -n "$CHECKOUT_LIBCXX" ]; then
fi
LIBCXX=$(pwd)/libcxx
MERGE_ARCHIVES=$(pwd)/merge-archives.sh
case $(uname) in
MINGW*)
......@@ -125,7 +124,7 @@ build_all() {
else
# Merge libpsapi.a into the static library libunwind.a, to
# avoid having to specify -lpsapi when linking to it.
$MERGE_ARCHIVES \
llvm-ar qcsL \
$PREFIX/$arch-w64-mingw32/lib/libunwind.a \
$PREFIX/$arch-w64-mingw32/lib/libpsapi.a
fi
......@@ -212,6 +211,7 @@ build_all() {
-DLIBCXX_CXX_ABI_INCLUDE_PATHS=../../libcxxabi/include \
-DLIBCXX_CXX_ABI_LIBRARY_PATH=../../libcxxabi/build-$arch-$type/lib \
-DLIBCXX_LIBDIR_SUFFIX="" \
-DLIBCXX_INCLUDE_TESTS=FALSE \
-DCMAKE_CXX_FLAGS="$LIBCXX_VISIBILITY_FLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS="-lunwind -Wl,--export-all-symbols" \
-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=FALSE \
......@@ -219,12 +219,12 @@ build_all() {
make -j$CORES
make install
if [ "$type" = "shared" ]; then
$MERGE_ARCHIVES \
llvm-ar qcsL \
$PREFIX/$arch-w64-mingw32/lib/libc++.dll.a \
$PREFIX/$arch-w64-mingw32/lib/libunwind.dll.a
cp lib/libc++.dll $PREFIX/$arch-w64-mingw32/bin
else
$MERGE_ARCHIVES \
llvm-ar qcsL \
$PREFIX/$arch-w64-mingw32/lib/libc++.a \
$PREFIX/$arch-w64-mingw32/lib/libunwind.a
fi
......
......@@ -56,13 +56,13 @@ fi
if [ -n "$SYNC" ] || [ -n "$CHECKOUT" ]; then
cd llvm
[ -z "$SYNC" ] || git fetch
git checkout c76c02e1ed1a158628019f61aea45fcf87712d2c
git checkout 059c128e6ee93a3fd6e2ba11f207ada3d27af811
cd tools/clang
[ -z "$SYNC" ] || git fetch
git checkout e3de7bb263271008c55cc8bf3186a3a08999fbaa
git checkout 4abdc59b18598c47000cdc8560a0dd575bc8197d
cd ../lld
[ -z "$SYNC" ] || git fetch
git checkout 935d766de8b251de001fed5f44b9567ccf6cadb1
git checkout ed673fddf832ed44e04c7960d89e4b6a2d2afef0
cd ../../..
fi
......
......@@ -41,7 +41,7 @@ cd mingw-w64
if [ -n "$SYNC" ] || [ -n "$CHECKOUT" ]; then
[ -z "$SYNC" ] || git fetch
git checkout f7b2feb36b321da90e1abf95f40efb5170126400
git checkout dc348cb1b4673ff897507ea29c27adb1c750e4a7
fi
# If crosscompiling the toolchain itself, we already have a mingw-w64
......
#!/bin/sh
set -e
if [ $# -lt 2 ]; then
echo $0 lib add1 [add2...]
exit 1
fi
: ${AR:=llvm-ar}
: ${RANLIB:=llvm-ranlib}
SCRIPT=merge.mri
OUT=tmp.a
TARGET=$1
rm -f $SCRIPT
echo "CREATE $OUT" >> $SCRIPT
while [ $# -gt 0 ]; do
case $(uname) in
MINGW*)
echo "ADDLIB $(cygpath -w $1)" >> $SCRIPT
;;
*)
echo "ADDLIB $1" >> $SCRIPT
;;
esac
shift
done
echo "SAVE" >> $SCRIPT
echo "END" >> $SCRIPT
$AR -M < $SCRIPT
rm -f $SCRIPT
$RANLIB $OUT
mv $OUT $TARGET
......@@ -18,7 +18,7 @@ MINGW*)
esac
cd bin
for i in bugpoint c-index-test clang-* diagtool dsymutil git-clang-format hmaptool ld64.lld llc lli llvm-* obj2yaml opt sancov sanstats scan-build scan-view verify-uselistorder wasm-ld yaml2obj libclang.dll LTO.dll *.bat; do
for i in bugpoint c-index-test clang-* diagtool dsymutil git-clang-format hmaptool ld64.lld llc lli llvm-* obj2yaml opt sancov sanstats scan-build scan-view verify-uselistorder wasm-ld yaml2obj libclang.dll LTO.dll OptRemarks.dll *.bat; do
basename=$i
if [ -n "$EXEEXT" ]; then
# Some in the list are expanded globs, some are plain names we list.
......
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