Merge pull request #478 from Chilledheart/crashpad_fix_libcxx_update

Crashpad fix libcxx update
Chilledheart · Dec 3, 2023 · 22d365d · 22d365d
2 parents c5e7e9a + 9db52a5
commit 22d365d
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 2,167 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3093,7 +3093,6 @@ set(files
     src/core/check.cpp
     src/core/scoped_clear_last_error_win.cpp
     src/core/ref_counted.cpp
-    src/core/utf_string_conversion_utils.cpp
     src/core/base64.cpp
     src/core/hash.cpp
     src/core/atl_throw.cpp
@@ -3169,9 +3168,7 @@ set(hfiles
     src/core/check_op.hpp
     src/core/check.hpp
     src/core/atomic_ref_count.hpp
-    src/core/gtest_prod_util.hpp
     src/core/ref_counted.hpp
-    src/core/utf_string_conversion_utils.hpp
     src/core/hash.hpp
     src/core/base64.hpp
     src/core/atl_throw.hpp
@@ -3711,7 +3708,7 @@ endif()
 #           Source code: LICENSE part
 # *****************************************************************************************
 
-if(NOT CMAKE_SKIP_INSTALL_RULES AND GUI)
+if(NOT CMAKE_SKIP_INSTALL_RULES)
   file(READ LICENSE                                         _YASS_LICENSE)
   file(READ third_party/abseil-cpp/LICENSE                  _ABSEIL_CPP_LICENSE)
   file(READ third_party/asio/asio/LICENSE_1_0.txt           _ASIO_LICENSE)

diff --git a/scripts/build-crashpad.sh b/scripts/build-crashpad.sh
@@ -48,19 +48,19 @@ case "$ARCH" in
   Darwin)
     flags="$flags
 clang_path=\"$PWD/llvm-build/Release+Asserts\"
-extra_cflags_cc=\"-nostdinc++ -I $PWD/libc++ -I $PWD/libc++/trunk/include -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_OVERRIDABLE_FUNC_VIS='__attribute__((__visibility__(\\\"default\\\")))'\"
-extra_cflags_objcc=\"-nostdinc++ -I $PWD/libc++ -I $PWD/libc++/trunk/include -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_OVERRIDABLE_FUNC_VIS='__attribute__((__visibility__(\\\"default\\\")))'\""
+extra_cflags_cc=\"-nostdinc++ -I $PWD/libc++ -I $PWD/libc++/trunk/include -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_OVERRIDABLE_FUNC_VIS='__attribute__((__visibility__(\\\"default\\\")))'\"
+extra_cflags_objcc=\"-nostdinc++ -I $PWD/libc++ -I $PWD/libc++/trunk/include -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_OVERRIDABLE_FUNC_VIS='__attribute__((__visibility__(\\\"default\\\")))'\""
   ;;
   Linux)
     flags="$flags
 clang_path=\"$PWD/llvm-build/Release+Asserts\"
-extra_cflags_cc=\"-nostdinc++ -I $PWD/libc++ -I $PWD/libc++/trunk/include -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_OVERRIDABLE_FUNC_VIS='__attribute__((__visibility__(\\\"default\\\")))'\""
+extra_cflags_cc=\"-nostdinc++ -I $PWD/libc++ -I $PWD/libc++/trunk/include -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_OVERRIDABLE_FUNC_VIS='__attribute__((__visibility__(\\\"default\\\")))'\""
   ;;
   Windows)
     flags="$flags
 clang_path=\"$(cygpath -m $PWD)/llvm-build/Release+Asserts\"
 extra_cflags=\"/MT\"
-extra_cflags_cc=\"-I $(cygpath -m $PWD)/libc++ -I $(cygpath -m $PWD)/libc++/trunk/include -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_OVERRIDABLE_FUNC_VIS='__attribute__((__visibility__(\\\"default\\\")))'\""
+extra_cflags_cc=\"-I $(cygpath -m $PWD)/libc++ -I $(cygpath -m $PWD)/libc++/trunk/include -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_OVERRIDABLE_FUNC_VIS='__attribute__((__visibility__(\\\"default\\\")))'\""
   ;;
 esac
 
@@ -120,7 +120,7 @@ case "$ARCH" in
 esac
 
 cp -f ../../../scripts/mini_chromium.BUILD.gn third_party/mini_chromium/mini_chromium/build/config/BUILD.gn
-$sed 's|__hlt(0)|__builtin_trap()|g' third_party/mini_chromium/mini_chromium/base/logging.cc
+$sed 's|__hlt(0)|asm volatile("hlt #0")|g' third_party/mini_chromium/mini_chromium/base/logging.cc
 # build stage
 rm -rf "$out"
 mkdir -p "$out"