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

Use prebuild clang to build node modules

Browse source
This commit is contained in:
Cheng Zhao 2015-07-02 02:56:56 +00:00
parent 62a5159e72
commit 3a094e9802
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
script/bootstrap.py
View file

@ -25,13 +25,14 @@ def main():
enable_verbose_mode() enable_verbose_mode()
if sys.platform == 'cygwin': if sys.platform == 'cygwin':
update_win32_python() update_win32_python()
update_submodules()
update_node_modules('.')
bootstrap_brightray(args.dev, args.url, args.target_arch)
if PLATFORM != 'win32': if PLATFORM != 'win32':
update_clang() update_clang()
update_submodules()
update_node_modules('.')
bootstrap_brightray(args.dev, args.url, args.target_arch)
if args.target_arch == 'arm': if args.target_arch == 'arm':
download_arm_sysroot() download_arm_sysroot()
@ -91,6 +92,12 @@ def bootstrap_brightray(is_dev, url, target_arch):
def update_node_modules(dirname, env=None): def update_node_modules(dirname, env=None):
if env is None: if env is None:
env = os.environ env = os.environ
if PLATFORM == 'linux':
llvm_dir = os.path.join(SOURCE_ROOT, 'vendor', 'llvm-build',
'Release+Asserts', 'bin')
env['CC'] = os.path.join(llvm_dir, 'clang')
env['CXX'] = os.path.join(llvm_dir, 'clang++')
env['npm_config_clang'] = '1'
with scoped_cwd(dirname): with scoped_cwd(dirname):
if is_verbose_mode(): if is_verbose_mode():
execute_stdout([NPM, 'install', '--verbose'], env) execute_stdout([NPM, 'install', '--verbose'], env)

9
script/cibuild
View file

@ -40,14 +40,7 @@ def main():
rm_rf(os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor', 'download', rm_rf(os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor', 'download',
'libchromiumcontent')) 'libchromiumcontent'))
if is_travis and sys.platform == 'linux2': run_script('bootstrap.py', ['--dev'])
with scoped_env('GYP_DEFINES', 'clang=1'):
with scoped_env('CXX', 'clang++'):
with scoped_env('CC', 'clang'):
run_script('bootstrap.py', ['--dev'])
run_script('update.py')
else:
run_script('bootstrap.py', ['--dev'])
run_script('cpplint.py') run_script('cpplint.py')
if sys.platform != 'win32': if sys.platform != 'win32':