Add LIBCXXABI_ENABLE_STATIC_UNWINDER=ON LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=OFF LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=ON to libc++ when libunwind is built Matches what is done on brew: https://bit.ly/3kDNpC9

This commit is contained in:
Sylvestre Ledru 2021-08-29 15:59:33 +02:00
parent 54c1ec180d
commit 2f0b96606f
2 changed files with 11 additions and 2 deletions

8
debian/changelog vendored
View File

@ -128,7 +128,13 @@ llvm-toolchain-snapshot (1:13~++20210129063721+010b176cdefb-1~exp1) experimental
llvm-toolchain-12 (1:12.0.1-7) UNRELEASED; urgency=medium
* cmake: use ON instead of YES for consistency
* cmake: use ON instead of YES for consistency
* Add LIBCXXABI_ENABLE_STATIC_UNWINDER=ON
LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=OFF
LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=ON
to libc++ when libunwind is built
Matches what is done on brew:
https://bit.ly/3kDNpC9
[ Gianfranco Costamagna ]
* Add a patch to fix omp build on riscv64

5
debian/rules vendored
View File

@ -213,7 +213,10 @@ ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel m68k mipsel hurd-i386 powerpc spa
LIBUNWIND_ENABLE=no
else
PROJECTS+=;libunwind
CMAKE_LIBCXX_EXTRA += -DLIBCXXABI_USE_LLVM_UNWINDER=ON
CMAKE_LIBCXX_EXTRA += -DLIBCXXABI_USE_LLVM_UNWINDER=ON \
-DDLIBCXXABI_ENABLE_STATIC_UNWINDER=ON \
-DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=OFF \
-DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=ON
endif
RUN_TEST=yes