From 3a094e98024353cab5cf4350e277f549ab015d03 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 2 Jul 2015 02:56:56 +0000 Subject: [PATCH] Use prebuild clang to build node modules --- script/bootstrap.py | 13 ++++++++++--- script/cibuild | 9 +-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/script/bootstrap.py b/script/bootstrap.py index 6314ea91c..6d89dbe35 100755 --- a/script/bootstrap.py +++ b/script/bootstrap.py @@ -25,13 +25,14 @@ def main(): enable_verbose_mode() if sys.platform == 'cygwin': update_win32_python() - update_submodules() - update_node_modules('.') - bootstrap_brightray(args.dev, args.url, args.target_arch) if PLATFORM != 'win32': update_clang() + update_submodules() + update_node_modules('.') + bootstrap_brightray(args.dev, args.url, args.target_arch) + if args.target_arch == 'arm': download_arm_sysroot() @@ -91,6 +92,12 @@ def bootstrap_brightray(is_dev, url, target_arch): def update_node_modules(dirname, env=None): if env is None: 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): if is_verbose_mode(): execute_stdout([NPM, 'install', '--verbose'], env) diff --git a/script/cibuild b/script/cibuild index 6772f3b26..8193908bf 100755 --- a/script/cibuild +++ b/script/cibuild @@ -40,14 +40,7 @@ def main(): rm_rf(os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor', 'download', 'libchromiumcontent')) - if is_travis and sys.platform == 'linux2': - 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('bootstrap.py', ['--dev']) run_script('cpplint.py') if sys.platform != 'win32':