github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Explicit set default arch

Browse Source
This commit is contained in:
Cheng Zhao
2015-04-11 18:26:15 +08:00
parent de016e72a5
commit 6175380bc0
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
script/lib/config.py
View File

@@ -1,5 +1,6 @@
#!/usr/bin/env python
import errno
import os
import platform
import sys
@@ -30,12 +31,17 @@ def get_target_arch():
return 'x64'
# On Windows it depends on user.
elif PLATFORM == 'win32':
target_arch_path = os.path.join(__file__, '..', '..', '..', 'vendor',
'brightray', 'vendor', 'download',
'libchromiumcontent', '.target_arch')
with open(os.path.normpath(target_arch_path)) as f:
target_arch = f.read().strip()
return target_arch
try:
target_arch_path = os.path.join(__file__, '..', '..', '..', 'vendor',
'brightray', 'vendor', 'download',
'libchromiumcontent', '.target_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
# Build 32bit by default.
return 'ia32'
# Maybe we will support other platforms in future.
else:
return 'x64'