mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-08-04 01:26:58 +00:00
fix merge
This commit is contained in:
parent
f2597caf79
commit
1e35ae451d
5
debian/rules
vendored
5
debian/rules
vendored
@ -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) \
|
||||
|
Loading…
Reference in New Issue
Block a user