From 81d092e9673e15ec780756971b6e3dff5bd8768a Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 11 Nov 2023 22:35:34 -0600
Subject: [PATCH] [buildcore] Windows fixes

---
 deps/buildcore/scripts/pybb.py        | 3 ++-
 deps/buildcore/scripts/setup-build.py | 4 +++-
 deps/buildcore/scripts/util.py        | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/deps/buildcore/scripts/pybb.py b/deps/buildcore/scripts/pybb.py
index cb253ec59..098f378fd 100755
--- a/deps/buildcore/scripts/pybb.py
+++ b/deps/buildcore/scripts/pybb.py
@@ -14,6 +14,7 @@
 import os
 import platform
 import shutil
+import socket
 import subprocess
 import sys
 from typing import List, Optional
@@ -115,7 +116,7 @@ def hostname() -> int:
 
 
 def host_env() -> int:
-    os_name = os.uname().sysname.lower()
+    os_name = socket.gethostname().lower()
     arch = platform.machine()
     if arch == 'amd64':
         arch = 'x86_64'
diff --git a/deps/buildcore/scripts/setup-build.py b/deps/buildcore/scripts/setup-build.py
index 3df28cd48..ebbad37e2 100755
--- a/deps/buildcore/scripts/setup-build.py
+++ b/deps/buildcore/scripts/setup-build.py
@@ -84,7 +84,7 @@ def main() -> int:
     build_dir = f'{project_dir}/{args.build_root}/{build_config}'
     util.rm(build_dir)
     cmake_cmd = [
-        'cmake', '-S', project_dir, '-B', build_dir, build_tool,
+        'cmake', '-S', project_dir, '-B', build_dir,
         '-DCMAKE_EXPORT_COMPILE_COMMANDS=ON',
         '-DCMAKE_TOOLCHAIN_FILE={:s}'.format(args.toolchain),
         '-DCMAKE_BUILD_TYPE={:s}'.format(build_type_arg),
@@ -92,6 +92,8 @@ def main() -> int:
         '-DBUILDCORE_BUILD_CONFIG={:s}'.format(build_config),
         '-DBUILDCORE_TARGET={:s}'.format(args.target),
     ]
+    if build_tool != '':
+        cmake_cmd.append(build_tool)
     if qt_path != '':
         cmake_cmd.append(qt_path)
     if platform.system() == 'Windows':
diff --git a/deps/buildcore/scripts/util.py b/deps/buildcore/scripts/util.py
index f87331bd5..c37e63328 100644
--- a/deps/buildcore/scripts/util.py
+++ b/deps/buildcore/scripts/util.py
@@ -28,11 +28,11 @@ def rm(path: str):
 
 
 def get_os() -> str:
-    return os.uname().sysname.lower()
+    return platform.system().lower()
 
 
 def get_arch() -> str:
     arch = platform.machine()
-    if arch == 'amd64':
+    if arch.lower() == 'amd64':
         arch = 'x86_64'
     return arch