From 1f378732a4e8a74b14083ebcc67645f840026477 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Thu, 26 Sep 2024 14:27:16 +0300 Subject: [PATCH] tk: revert "Try using unix build system on mac" This reverts commit 3bc0da0e9a18b48aa7d2cd98c6c79fa11a23a418. --- recipes/tk/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/tk/all/conanfile.py b/recipes/tk/all/conanfile.py index be83399976bb0..7232790eb4fee 100644 --- a/recipes/tk/all/conanfile.py +++ b/recipes/tk/all/conanfile.py @@ -114,7 +114,7 @@ def generate(self): f"--enable-symbols={yes_no(self.settings.build_type == 'Debug')}" ) tc.configure_args.append( - f"--enable-64bit={yes_no(self.settings.arch == 'x86_64')}" + f"--enable-64bit={yes_no(self.settings.arch in ('x86_64', 'armv8'))}" ) tc.configure_args.append(f"--enable-aqua={yes_no(is_apple_os(self))}") tc.configure_args.append( @@ -142,7 +142,7 @@ def generate(self): def _get_default_build_system(self): if is_apple_os(self): - return "unix" + return "macosx" elif self.settings.os in ("Linux", "FreeBSD"): return "unix" elif self.settings.os == "Windows":