improve libunwind option handling to try and not break builds on platforms

that don't support it
This commit is contained in:
Erik Maciejewski 2021-09-29 11:30:37 -07:00
parent 22dabd0662
commit e91f88e9a1

17
debian/rules vendored
View File

@ -188,6 +188,7 @@ CFLAGS_EXTRA += -Wno-unused-command-line-argument
CXXFLAGS_EXTRA += -Wno-unused-command-line-argument
BOOTSTRAP_CFLAGS_EXTRA = $(CFLAGS_EXTRA)
BOOTSTRAP_CXXFLAGS_EXTRA = $(CXXFLAGS_EXTRA)
BOOTSTRAP_LDFLAGS_EXTRA = -rtlib=compiler-rt
# Enable polly (or not)
POLLY_ENABLE=yes
@ -211,9 +212,11 @@ ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel mipsel hurd-i386 powerpc sparc sp
LIBUNWIND_ENABLE=no
else
RUNTIMES += ;libunwind
CMAKE_EXTRA += \
-DLIBUNWIND_USE_COMPILER_RT=ON \
-DLIBCXXABI_USE_LLVM_UNWINDER=ON
BOOTSTRAP_LDFLAGS_EXTRA += -l:libunwind.so
# these are also added to stage2 via CLANG_BOOTSTRAP_PASSTHROUGH
STAGE1_CMAKE_EXTRA += \
-DLIBCXXABI_USE_LLVM_UNWINDER=ON \
-DOPENMP_USE_LLVM_UNWINDER=ON
endif
RUN_TEST=yes
@ -467,7 +470,6 @@ override_dh_auto_configure: preconfigure
-DLIBUNWIND_INSTALL_LIBRARY=OFF \
-DLIBCXXABI_ENABLE_SHARED=ON \
-DLIBCXXABI_USE_COMPILER_RT=ON \
-DLIBCXXABI_USE_LLVM_UNWINDER=ON \
-DLIBCXXABI_INSTALL_LIBRARY=OFF \
-DLIBCXX_ENABLE_SHARED=ON \
-DLIBCXX_USE_COMPILER_RT=ON \
@ -477,7 +479,6 @@ override_dh_auto_configure: preconfigure
-DLIBCXX_INSTALL_LIBRARY=OFF \
-DOPENMP_ENABLE_LIBOMP_PROFILING=OFF \
-DOPENMP_ENABLE_LIBOMPTARGET_PROFILING=OFF \
-DOPENMP_USE_LLVM_UNWINDER=ON \
-DLIBOMP_ENABLE_RTTI=OFF \
-DLIBOMP_OMPT_SUPPORT=OFF \
$(STAGE1_CMAKE_EXTRA) \
@ -490,9 +491,9 @@ override_dh_auto_configure: preconfigure
-DBOOTSTRAP_CMAKE_CXX_FLAGS_RELWITHDEBINFO="$(opt_flags)" \
-DBOOTSTRAP_CMAKE_CXX_FLAGS="$(BOOTSTRAP_CXXFLAGS_EXTRA)" \
-DBOOTSTRAP_CMAKE_C_FLAGS="$(BOOTSTRAP_CFLAGS_EXTRA)" \
-DBOOTSTRAP_CMAKE_SHARED_LINKER_FLAGS="-rtlib=compiler-rt -l:libunwind.so" \
-DBOOTSTRAP_CMAKE_MODULE_LINKER_FLAGS="-rtlib=compiler-rt -l:libunwind.so" \
-DBOOTSTRAP_CMAKE_EXE_LINKER_FLAGS="-rtlib=compiler-rt -l:libunwind.so" \
-DBOOTSTRAP_CMAKE_SHARED_LINKER_FLAGS="$(BOOTSTRAP_LDFLAGS_EXTRA)" \
-DBOOTSTRAP_CMAKE_MODULE_LINKER_FLAGS="$(BOOTSTRAP_LDFLAGS_EXTRA)" \
-DBOOTSTRAP_CMAKE_EXE_LINKER_FLAGS="$(BOOTSTRAP_LDFLAGS_EXTRA)" \
-DBOOTSTRAP_LLVM_ENABLE_LLD=ON \
-DBOOTSTRAP_LLVM_ENABLE_LIBCXX=ON \
-DBOOTSTRAP_LLVM_ENABLE_FFI=ON \