remove some non functional options

This commit is contained in:
Sylvestre Ledru 2021-08-31 22:51:53 +02:00
parent 591436a41a
commit 0d8c8debd1
2 changed files with 11 additions and 7 deletions

6
debian/changelog vendored
View File

@ -130,12 +130,6 @@ llvm-toolchain-12 (1:12.0.1-7) unstable; urgency=medium
* Add debian/source/options to ignore the diff (much much faster to repack)
* 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
* Don't generate the llvm-mcmarkup & lldb-mi manpages (don't exist anymore)
(LP: #1940713)

12
debian/rules vendored
View File

@ -426,7 +426,6 @@ override_dh_auto_configure: preconfigure
-DLLVM_ENABLE_RTTI=ON \
-DLLVM_ENABLE_FFI=ON \
-DLLVM_ENABLE_DUMP=ON \
$(CMAKE_EXTRA) \
-DLIBCLANG_LIBRARY_VERSION=$(SONAME_EXT) \
-DCLANG_LINK_CLANG_DYLIB=ON \
-DENABLE_LINKER_BUILD_ID=ON \
@ -515,6 +514,17 @@ debian-libcxxabi-build:
$(PRE_PROCESS_CONF) make $(NJOBS) $(VERBOSE) CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)"
touch $@
# Fails with $<TARGET_LINKER_FILE:unwind_static>
# No target "unwind_static"
# on 12. Will test with 13
# -DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON \
# -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=OFF \
# -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=ON \
N
#- to libc++ when libunwind is built
#- Matches what is done on brew:
#- https://bit.ly/3kDNpC9
debian-libcxx-build:
# Builds libcxx
echo "Using cmake: $(CMAKE_BIN)"; \