From 063cfa10c5aa674613c5532394c6acab48934bfb Mon Sep 17 00:00:00 2001 From: Rye Mutt <rye@alchemyviewer.org> Date: Wed, 6 Mar 2024 15:05:04 -0500 Subject: [PATCH] Try disabling crash reporter on mac again --- .gitlab-ci.yml | 1 + indra/cmake/Sentry.cmake | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dbb92c1e3e3..c5979863bb4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -208,6 +208,7 @@ coverity_scan: extends: .mac_build variables: AUTOBUILD_ADDRSIZE: 64 + USE_SENTRY: "FALSE" cache: key: prefix: darwin64 diff --git a/indra/cmake/Sentry.cmake b/indra/cmake/Sentry.cmake index 24c1ffb9db0..adf3403840c 100644 --- a/indra/cmake/Sentry.cmake +++ b/indra/cmake/Sentry.cmake @@ -7,7 +7,7 @@ include(OpenSSL) include(ZLIBNG) include_guard() -if (DEFINED ENV{USE_SENTRY}) +if (DEFINED ENV{USE_SENTRY} AND NOT DARWIN) set(USE_SENTRY $ENV{USE_SENTRY} CACHE BOOL "" FORCE) endif() @@ -17,7 +17,7 @@ else() set(SENTRY_DSN "" CACHE STRING "Sentry DSN") endif() -if (INSTALL_PROPRIETARY AND NOT SENTRY_DSN STREQUAL "") +if (INSTALL_PROPRIETARY AND NOT SENTRY_DSN STREQUAL "" AND NOT DARWIN) set(USE_SENTRY ON CACHE BOOL "Use the Sentry crash reporting system") endif () -- GitLab