This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch main in repository builders/tor-browser-build.
commit a848d2e33e381961cadedd6602d975b95255f558 Author: Richard Pospesel richard@torproject.org AuthorDate: Thu Sep 1 19:57:37 2022 +0000
Revert "Bug 41152: Do not merge libc++ and libunwind"
This reverts commit c4c7d4e0acaa070e4153d001612fe780d13a7b2e. --- projects/mingw-w64-clang/build | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 313d7e7..92a47cf 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -163,6 +163,24 @@ cd build make -j[% c("num_procs") %] VERBOSE=1 make install
+# libc++.a depends on libunwind.a. While the linker will automatically link to +# libc++.a in C++ mode, it won't pick libunwind.a, requiring the caller to +# explicitly pass -lunwind. To work around that, we merge libunwind.a into +# libc++.a. +merge_libs() { + cat <<EOF |llvm-ar -M +CREATE tmp.a +ADDLIB $1 +ADDLIB $2 +SAVE +END +EOF + llvm-ranlib tmp.a + mv tmp.a $1 +} + +merge_libs $distdir/[% c("arch") %]-w64-mingw32/lib/libc++.a $distdir/[% c("arch") %]-w64-mingw32/lib/libunwind.a + # libssp # See build-libssp.sh in llvm-mingw cd $rootdir