Skip to content

Commit ed3ebba

Browse files
authored
Do not use unwinder in libc++ and clang (#596)
Tested on ubuntu LD_LIBRARY_PATH=./artifacts/obj/libcxx/InstallRoot-arm64/lib/ ldd ./artifacts/obj/InstallRoot-arm64/bin/clang++ linux-vdso.so.1 (0x0000ffffb9058000) libm.so.6 => /lib/aarch64-linux-gnu/libm.so.6 (0x0000ffffb2ec0000) libz.so.1 => /lib/aarch64-linux-gnu/libz.so.1 (0x0000ffffb2e80000) libc++.so.1 => ./artifacts/obj/libcxx/InstallRoot-arm64/lib/libc++.so.1 (0x0000ffffb2cf0000) libc++abi.so.1 => ./artifacts/obj/libcxx/InstallRoot-arm64/lib/libc++abi.so.1 (0x0000ffffb2c70000) libgcc_s.so.1 => /lib/aarch64-linux-gnu/libgcc_s.so.1 (0x0000ffffb2c30000) libc.so.6 => /lib/aarch64-linux-gnu/libc.so.6 (0x0000ffffb2a70000) /lib/ld-linux-aarch64.so.1 (0x0000ffffb901b000)
1 parent e5c221b commit ed3ebba

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

llvm.proj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
<_LLVMBuildArgs Include='-DLLVM_EXTERNALIZE_DEBUGINFO=ON' />
101101
<_LLVMBuildArgs Include='-DLLVM_EXTERNALIZE_DEBUGINFO_INSTALL=ON' />
102102
<_LLVMBuildArgs Include='-DLLVM_ENABLE_PDB=ON' />
103+
<_LLVMBuildArgs Include='-DCOMPILER_RT_USE_LLVM_UNWINDER=OFF' />
103104
<_LLVMBuildArgs Condition="'$(BuildOS)' == 'Linux'" Include='-DLLVM_EXTERNALIZE_DEBUGINFO_EXTENSION=dbg' />
104105
<_LLVMBuildArgs Condition="'$(BuildOS)' == 'OSX'" Include='-DLLVM_EXTERNALIZE_DEBUGINFO_EXTENSION=dwarf -DLLVM_EXTERNALIZE_DEBUGINFO_FLATTEN=ON' />
105106
<_LLVMBuildArgs Condition="'$(BuildOS)' == 'FreeBSD'" Include='-DLLVM_EXTERNALIZE_DEBUGINFO_EXTENSION=dbg' />
@@ -171,6 +172,7 @@
171172
<_LibCxxBuildArgs Include='-DCMAKE_POSITION_INDEPENDENT_CODE=ON' />
172173
<_LibCxxBuildArgs Include="-DCMAKE_CXX_COMPILER_TARGET=$(ClangTarget)" />
173174
<_LibCxxBuildArgs Include="-DLLVM_DEFAULT_TARGET_TRIPLE=$(ClangTarget)" />
175+
<_LibCxxBuildArgs Include="-DLIBCXXABI_USE_LLVM_UNWINDER=OFF" />
174176
<_LibCxxBuildArgs Condition="$(ClangTarget.ToLowerInvariant().Contains('musl'))" Include="-DLIBCXX_HAS_MUSL_LIBC=ON" />
175177
</ItemGroup>
176178
<PropertyGroup>

0 commit comments

Comments
 (0)