From c9395adfcc56e636710da55ff987699050f160fd Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Fri, 13 Feb 2026 13:16:37 -0600
Subject: [PATCH] fixup! refactor: move string-utils, tr-assert, tr-macros to
 libtrbase.a

fix macOS build error
---
 tr/base/CMakeLists.txt    | 2 +-
 tr/torrent/CMakeLists.txt | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/tr/base/CMakeLists.txt b/tr/base/CMakeLists.txt
index 59d1a8d3c..8e851763e 100644
--- a/tr/base/CMakeLists.txt
+++ b/tr/base/CMakeLists.txt
@@ -28,7 +28,7 @@ target_sources(trbase
         serializer.h
         string-utils.cc
         string-utils.h
-        $<$<BOOL:${IS_APPLE_CLANG}>:string-utils.mm>
+        $<$<AND:$<BOOL:${APPLE}>,$<OR:$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:Clang>>>:string-utils.mm>
         tr-assert.cc
         tr-assert.h
         tr-getopt.cc
diff --git a/tr/torrent/CMakeLists.txt b/tr/torrent/CMakeLists.txt
index 85c159c2a..0adabde4b 100644
--- a/tr/torrent/CMakeLists.txt
+++ b/tr/torrent/CMakeLists.txt
@@ -10,11 +10,6 @@ add_compile_options(
 
 add_library(${TR_NAME} STATIC)
 
-set(IS_APPLE_CLANG FALSE)
-if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(IS_APPLE_CLANG TRUE)
-endif()
-
 target_sources(${TR_NAME}
     PRIVATE
         announce-list.cc