Merge dba2d52 into 4452840

mystaff · Nov 16, 2021 · 5b615b1 · 5b615b1
2 parents 4452840 + dba2d52
commit 5b615b1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,4 +10,4 @@
 [submodule "external/crashpad"]
 	path = external/crashpad
 	url = https://github.com/mystaff/crashpad.git
-	branch = timedoctor
+	branch = yalbar-STAFF-121291
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -417,6 +417,10 @@ if(SENTRY_BACKEND_CRASHPAD)
 		else()
 			set(CRASHPAD_ENABLE_INSTALL ON CACHE BOOL "Enable crashpad installation" FORCE)
 		endif()
+		if(APPLE AND NOT IOS)
+			set(CRASHPAD_ENABLE_STACKTRACE ON CACHE BOOL "Enable client-side stacktrace" FORCE)
+		endif()
+
 		add_subdirectory(external/crashpad crashpad_build)
 
 		# set static runtime if enabled

diff --git a/external/breakpad b/external/breakpad
diff --git a/external/crashpad b/external/crashpad