fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BUILD] Fixed clang format selecting wrong binary architecture

Browse Source
This commit is contained in:
Adrian
2026-04-23 01:01:34 +01:00
committed by Radosław Gliński
parent 5174c2f2e0
commit e2200e8435
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xenia-build.py
View File

@@ -659,8 +659,11 @@ def get_clang_format_binary():
# Add Windows-specific paths # Add Windows-specific paths
if sys.platform == "win32": if sys.platform == "win32":
if "VCINSTALLDIR" in os.environ: if "VCINSTALLDIR" in os.environ:
all_binaries.append(os.path.join(os.environ["VCINSTALLDIR"], "Tools", "Llvm", "x64", "bin", "clang-format.exe")) if is_amd64():
all_binaries.append(os.path.join(os.environ["VCINSTALLDIR"], "Tools", "Llvm", "arm64", "bin", "clang-format.exe")) all_binaries.append(os.path.join(os.environ["VCINSTALLDIR"], "Tools", "Llvm", "x64", "bin", "clang-format.exe"))
elif is_arm():
all_binaries.append(os.path.join(os.environ["VCINSTALLDIR"], "Tools", "Llvm", "arm64", "bin", "clang-format.exe"))
all_binaries.append(os.path.join(os.environ["ProgramFiles"], "LLVM", "bin", "clang-format.exe")) all_binaries.append(os.path.join(os.environ["ProgramFiles"], "LLVM", "bin", "clang-format.exe"))
# Find the highest version available # Find the highest version available
@@ -697,6 +700,11 @@ def normalize_target_arch(value):
raise ArgumentTypeError( raise ArgumentTypeError(
f"unknown architecture '{value}' (expected: arm64, aarch64, a64, x64, amd64, x86_64, x86)") f"unknown architecture '{value}' (expected: arm64, aarch64, a64, x64, amd64, x86_64, x86)")
def is_amd64():
return normalize_target_arch(platform.machine()) in ("x64", "x86_64", "amd64", "x86")
def is_arm():
return normalize_target_arch(platform.machine()) in ("x64", "x86_64", "amd64", "x86")
def get_build_dir(target_arch=None): def get_build_dir(target_arch=None):
"""Returns the Ninja build directory for the given target architecture. """Returns the Ninja build directory for the given target architecture.