From 72d3d9be012ff86623c6b5f0af5549a8b5d4e13e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 27 Sep 2021 12:11:31 +0200 Subject: [PATCH] * experimental New snapshot release * Bring back the libc++/libc++abi options --- debian/changelog | 7 +++++++ debian/rules | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index b2caca97..abd6616f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-snapshot (1:14~++20210926041028+6063e6b499c7-1~exp1) UNRELEASED; urgency=medium + + * experimental New snapshot release + * Bring back the libc++/libc++abi options + + -- Sylvestre Ledru Sun, 26 Sep 2021 16:14:44 +0200 + llvm-toolchain-snapshot (1:14~++20210924122635+4a57f5d1e1c5-1~exp1) experimental; urgency=medium [ Sylvestre Ledru ] diff --git a/debian/rules b/debian/rules index 548303f7..79e87884 100755 --- a/debian/rules +++ b/debian/rules @@ -444,6 +444,13 @@ override_dh_auto_configure: preconfigure -DCLANG_ENABLE_BOOTSTRAP=ON \ -DCLANG_BUILD_EXAMPLES=OFF \ -DLLVM_POLLY_LINK_INTO_TOOLS=ON \ + -DLIBCXX_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \ + -DLIBCXX_USE_COMPILER_RT=ON \ + -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \ + -DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON \ + -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF \ + -DLIBCXXABI_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \ + -DLIBCXXABI_USE_COMPILER_RT=ON \ -DBOOTSTRAP_CMAKE_CXX_FLAGS='$(BOOTSTRAP_CXXFLAGS_EXTRA)' \ -DBOOTSTRAP_CMAKE_C_FLAGS='$(BOOTSTRAP_CFLAGS_EXTRA)' \ -DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_VERBOSE_MAKEFILE;CMAKE_BUILD_TYPE;CMAKE_CXX_FLAGS_RELWITHDEBINFO;LLVM_LINK_LLVM_DYLIB;LLVM_INSTALL_UTILS;LLVM_VERSION_SUFFIX;LLVM_ENABLE_SPHINX;SPHINX_WARNINGS_AS_ERRORS;LLVM_BUILD_LLVM_DYLIB;LLVM_ENABLE_RTTI;LLVM_ENABLE_FFI;LIBCLANG_LIBRARY_VERSION;ENABLE_LINKER_BUILD_ID;POLLY_BUNDLED_JSONCPP;LLVM_EXPERIMENTAL_TARGETS_TO_BUILD;LLVM_USE_PERF;LLVM_ENABLE_ASSERTIONS;LLVM_BINUTILS_INCDIR;LLVM_HOST_TRIPLE;LLVM_COMPILER_CHECKED;COMPILER_RT_BUILD_BUILTINS;LIBOMP_LIBFLAGS;CMAKE_SHARED_LINKER_FLAGS;PYTHON_EXECUTABLE;LLVM_ENABLE_Z3_SOLVER;LLVM_POLLY_LINK_INTO_TOOLS;CLANG_VENDOR;LIBUNWIND_USE_COMPILER_RT"|| tail -100 build-llvm/CMakeFiles/CMakeError.log