From 74fb30b6d6d4760744b273f1b362d986fe3aa782 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Wed, 6 Dec 2023 15:41:49 +0100 Subject: [PATCH 1/2] fix: allow crashpad build for Windows on ARM64 --- CHANGELOG.md | 1 + external/crashpad | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1902c36e03..4eac2c160d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ **Internal**: - Updated `crashpad` to 2023-11-24. ([#912](https://github.com/getsentry/sentry-native/pull/912), [crashpad#91](https://github.com/getsentry/crashpad/pull/91)) +- Fixing `crashpad` build for Windows on ARM64. ([#912](https://github.com/getsentry/sentry-native/pull/912), [crashpad#90](https://github.com/getsentry/crashpad/pull/90), [crashpad#92](https://github.com/getsentry/crashpad/pull/92), [crashpad#93](https://github.com/getsentry/crashpad/pull/93), [crashpad#94](https://github.com/getsentry/crashpad/pull/94)) **Thank you**: diff --git a/external/crashpad b/external/crashpad index e63d0c295c..89991e9910 160000 --- a/external/crashpad +++ b/external/crashpad @@ -1 +1 @@ -Subproject commit e63d0c295cece2965680a8ea71b0aa94ee312bd9 +Subproject commit 89991e9910bc4c0893e45c8cfad0bdd31cc25a5c From 6159a0ee7512b91e88b8d6afb1a4965893ffaa6f Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Wed, 6 Dec 2023 15:59:01 +0100 Subject: [PATCH 2/2] use correct PR in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4eac2c160d..0550d47243 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ **Internal**: - Updated `crashpad` to 2023-11-24. ([#912](https://github.com/getsentry/sentry-native/pull/912), [crashpad#91](https://github.com/getsentry/crashpad/pull/91)) -- Fixing `crashpad` build for Windows on ARM64. ([#912](https://github.com/getsentry/sentry-native/pull/912), [crashpad#90](https://github.com/getsentry/crashpad/pull/90), [crashpad#92](https://github.com/getsentry/crashpad/pull/92), [crashpad#93](https://github.com/getsentry/crashpad/pull/93), [crashpad#94](https://github.com/getsentry/crashpad/pull/94)) +- Fixing `crashpad` build for Windows on ARM64. ([#919](https://github.com/getsentry/sentry-native/pull/919), [crashpad#90](https://github.com/getsentry/crashpad/pull/90), [crashpad#92](https://github.com/getsentry/crashpad/pull/92), [crashpad#93](https://github.com/getsentry/crashpad/pull/93), [crashpad#94](https://github.com/getsentry/crashpad/pull/94)) **Thank you**: