mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

build: fix clang format location helper (#42530)

Browse source 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot] 2024-06-17 16:21:50 -04:00 • committed by GitHub
parent 9fc0bfece2
commit a9b0e73492
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
script/lib/util.py
View file

@ -4,6 +4,7 @@ import contextlib
import errno import errno
import json import json
import os import os
import platform
import shutil import shutil
import subprocess import subprocess
import sys import sys
@ -184,13 +185,16 @@ def get_electron_exec():
def get_buildtools_executable(name): def get_buildtools_executable(name):
buildtools = os.path.realpath(os.path.join(ELECTRON_DIR, '..', 'buildtools')) buildtools = os.path.realpath(os.path.join(ELECTRON_DIR, '..', 'buildtools'))
chromium_platform = {
'darwin': 'mac', if sys.platform == 'darwin':
'linux': 'linux64', chromium_platform = 'mac_arm64' if platform.machine() == 'arm64' else 'mac'
'linux2': 'linux64', elif sys.platform in ['win32', 'cygwin']:
'win32': 'win', chromium_platform = 'win'
'cygwin': 'win', elif sys.platform in ['linux', 'linux2']:
}[sys.platform] chromium_platform = 'linux64'
else:
raise Exception(f"Unsupported platform: {sys.platform}")
if name == 'clang-format': if name == 'clang-format':
path = os.path.join(buildtools, chromium_platform, 'format', name) path = os.path.join(buildtools, chromium_platform, 'format', name)
else: else: