diff --git a/debian/rules b/debian/rules index f4cf840b..a7240e81 100755 --- a/debian/rules +++ b/debian/rules @@ -763,11 +763,6 @@ endif -DCOMPILER_RT_INCLUDE_TESTS=OFF \ -DCOMPILER_RT_USE_LIBCXX=OFF \ -DCOMPILER_RT_USE_BUILTINS_LIBRARY=$(COMPILER_RT_USE_BUILTINS_LIBRARY) \ -<<<<<<< HEAD -======= - -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \ - -DLIBUNWIND_USE_COMPILER_RT=ON \ ->>>>>>> origin/17 -DLIBUNWIND_INSTALL_LIBRARY=OFF \ -DLIBCXXABI_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \ -DLIBCXXABI_USE_COMPILER_RT=$(LIBCXX_USE_COMPILER_RT) \