From 8eab76de3378430f8ed438837df93d6bcafc0468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gianguido=20Sor=C3=A0?= Date: Wed, 19 Oct 2022 14:20:12 +0200 Subject: [PATCH] fix: make hosted mode work on macos again When ditherpunk flag is enabled, graphics-server cannot start. I suspect macOS doesn't tranfer thread-local variables when a new one is spawned, and this makes xous-names, logs crash. This commit adds a compile setting that will bypass ditherpunk thread settings on macOS as well, allowing developers who happen to run this OS to develop and prototype for betrusted again. --- services/graphics-server/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/graphics-server/src/main.rs b/services/graphics-server/src/main.rs index 39c9584a5..6401e2d88 100644 --- a/services/graphics-server/src/main.rs +++ b/services/graphics-server/src/main.rs @@ -93,7 +93,7 @@ fn map_fonts() -> MemoryRange { fontregion } fn main () -> ! { - #[cfg(not(feature="ditherpunk"))] + #[cfg(any(not(feature = "ditherpunk"), target_os = "macos"))] wrapped_main(); #[cfg(feature="ditherpunk")]