From 8d34bb549736c341e84123760901bc981c46b184 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sat, 19 Jul 2025 07:11:20 +0800 Subject: Exclude Debian arm64 from WebRTC When WebRTC was compiled with the viewer, we got this: Fatal error in: ../webrtc/src/media/engine/adm_helpers.cc, line 39 last system error: 88 Check failed: 0 == adm->Init() (0 vs. -1) Failed to initialize the ADM. This commit hasn't included the additional preprocessor macro for the platform in indra/newview/llvoiceclient.cpp yet, because there's no such macro yet to distinguish such distro from any other GNU/Linux distro. --- indra/newview/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 7f509d38de..47d88457cb 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -751,7 +751,7 @@ set(viewer_SOURCE_FILES rlvhandler.cpp ) -if (CMAKE_SYSTEM_NAME MATCHES FreeBSD OR ($ENV{MSYSTEM_CARCH} MATCHES aarch64)) +if (CMAKE_SYSTEM_NAME MATCHES FreeBSD OR ($ENV{MSYSTEM_CARCH} MATCHES aarch64) OR (${LINUX_DISTRO} MATCHES debian AND CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)) list(REMOVE_ITEM viewer_SOURCE_FILES llvoicewebrtc.cpp) endif () @@ -2133,7 +2133,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ll::openxr ) -if (NOT (CMAKE_SYSTEM_NAME MATCHES FreeBSD OR ($ENV{MSYSTEM_CARCH} MATCHES aarch64))) +if (NOT (CMAKE_SYSTEM_NAME MATCHES FreeBSD OR ($ENV{MSYSTEM_CARCH} MATCHES aarch64) OR (${LINUX_DISTRO} MATCHES debian AND CMAKE_SYSTEM_PROCESSOR MATCHES aarch64))) target_link_libraries(${VIEWER_BINARY_NAME} llwebrtc ) endif () -- cgit v1.2.3