Skip to content

Commit

Permalink
tk: revert "Try using unix build system on mac"
Browse files Browse the repository at this point in the history
This reverts commit 3bc0da0.
  • Loading branch information
valgur committed Sep 26, 2024
1 parent 7ddfb07 commit 1f37873
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions recipes/tk/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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":
Expand Down

0 comments on commit 1f37873

Please sign in to comment.