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

chore: get target arch from TARGET_ARCH env var

Browse source
This commit is contained in:
Samuel Attard 2018-09-29 14:13:17 +10:00
parent d6500244a4
commit adc60a72ca
No known key found for this signature in database
GPG key ID: E89DDE5742D58C4E
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.circleci/config.yml
View file

@ -42,6 +42,7 @@ env-unittests: &env-unittests
env-ia32: &env-ia32 env-ia32: &env-ia32
GN_EXTRA_ARGS: 'target_cpu = "x86"' GN_EXTRA_ARGS: 'target_cpu = "x86"'
NPM_CONFIG_ARCH: ia32 NPM_CONFIG_ARCH: ia32
TARGET_ARCH: ia32
env-arm: &env-arm env-arm: &env-arm
GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True' GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True'

15
script/lib/config.py
View file

@ -35,17 +35,10 @@ def get_platform_key():
def get_target_arch(): def get_target_arch():
try: arch = os.environ.get('TARGET_ARCH')
target_arch_path = os.path.join(__file__, '..', '..', '..', 'vendor', if arch is None:
'download', 'libchromiumcontent', return 'x64'
'.target_arch') return arch
with open(os.path.normpath(target_arch_path)) as f:
return f.read().strip()
except IOError as e:
if e.errno != errno.ENOENT:
raise
return 'x64'
def get_env_var(name): def get_env_var(name):