Merge remote-tracking branch 'origin/10' into snapshot

This commit is contained in:
Sylvestre Ledru 2020-07-01 13:49:28 +02:00
commit a5b8e64898

View File

@ -2,6 +2,8 @@
set -e set -e
LLVM_VERSION=11
# this is taken from libjsoncpp package # this is taken from libjsoncpp package
# Presence of $ADTTMP implies that someone will handle cleanup for us, so we # Presence of $ADTTMP implies that someone will handle cleanup for us, so we
# can avoid duplicating the effort (signal handling, etc.) here. # can avoid duplicating the effort (signal handling, etc.) here.
@ -17,21 +19,21 @@ cd "$ADTTMP"
mkdir build mkdir build
cd build cd build
cmake -DLIT=/usr/lib/llvm-10/build/utils/lit/lit.py \ cmake -DLIT=/usr/lib/llvm-$LLVM_VERSION/build/utils/lit/lit.py \
-DCLANG_BINARY=/usr/bin/clang-10 \ -DCLANG_BINARY=/usr/bin/clang-$LLVM_VERSION \
-DCLANGXX_BINARY=/usr/bin/clang++-10 \ -DCLANGXX_BINARY=/usr/bin/clang++-$LLVM_VERSION \
-DCLANG_TIDY_BINARY=/usr/bin/clang-tidy-10 \ -DCLANG_TIDY_BINARY=/usr/bin/clang-tidy-$LLVM_VERSION \
-DCLANG_FORMAT_BINARY=/usr/bin/clang-format-10 \ -DCLANG_FORMAT_BINARY=/usr/bin/clang-format-$LLVM_VERSION \
-DLLD_BINARY=/usr/bin/lld-10 \ -DLLD_BINARY=/usr/bin/lld-$LLVM_VERSION \
-DLLDB_BINARY=/usr/bin/lldb-10 \ -DLLDB_BINARY=/usr/bin/lldb-$LLVM_VERSION \
-DLLVMCONFIG_BINARY=/usr/bin/llvm-config-10 \ -DLLVMCONFIG_BINARY=/usr/bin/llvm-config-$LLVM_VERSION \
-DOPT_BINARY=/usr/bin/opt-10 \ -DOPT_BINARY=/usr/bin/opt-$LLVM_VERSION \
-DSCANBUILD=/usr/bin/scan-build-10 \ -DSCANBUILD=/usr/bin/scan-build-$LLVM_VERSION \
-DCLANG_TIDY_BINARY=/usr/bin/clang-tidy-10 \ -DCLANG_TIDY_BINARY=/usr/bin/clang-tidy-$LLVM_VERSION \
-DSCANVIEW=/usr/bin/scan-view-10 \ -DSCANVIEW=/usr/bin/scan-view-$LLVM_VERSION \
-DLLVMNM=/usr/bin/llvm-nm-10 \ -DLLVMNM=/usr/bin/llvm-nm-$LLVM_VERSION \
-DLLVMPROFDATA=/usr/bin/llvm-profdata-10 \ -DLLVMPROFDATA=/usr/bin/llvm-profdata-$LLVM_VERSION \
-DENABLE_COMPILER_RT=OFF \ -DENABLE_COMPILER_RT=OFF \
-DENABLE_LIBCXX=ON \ -DENABLE_LIBCXX=ON \
-DLLVM_CMAKE_PREFIX_PATH=/usr/lib/llvm-10/lib/cmake/ ../ -DLLVM_CMAKE_PREFIX_PATH=/usr/lib/llvm-$LLVM_VERSION/lib/cmake/ ../
make check make check