[buildcore] Windows fixes
This commit is contained in:
parent
3fbb2a0086
commit
81d092e967
3
deps/buildcore/scripts/pybb.py
vendored
3
deps/buildcore/scripts/pybb.py
vendored
@ -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'
|
||||
|
4
deps/buildcore/scripts/setup-build.py
vendored
4
deps/buildcore/scripts/setup-build.py
vendored
@ -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':
|
||||
|
4
deps/buildcore/scripts/util.py
vendored
4
deps/buildcore/scripts/util.py
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user