linux: Don't set CXX to clang when building node modules.
This commit is contained in:
parent
ca522f06d3
commit
9035ffff55
3 changed files with 26 additions and 6 deletions
|
@ -4,7 +4,7 @@ import os
|
|||
import subprocess
|
||||
import sys
|
||||
|
||||
from lib.util import rm_rf
|
||||
from lib.util import execute, rm_rf, scoped_env
|
||||
|
||||
|
||||
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||
|
@ -21,9 +21,10 @@ LINUX_DEPS = [
|
|||
def main():
|
||||
os.environ['CI'] = '1'
|
||||
|
||||
if os.environ['TRAVIS'] == 'true' and sys.platform == 'linux2':
|
||||
subprocess.check_call(['sudo', 'apt-get', 'update'])
|
||||
subprocess.check_call(['sudo', 'apt-get', 'install'] + LINUX_DEPS)
|
||||
is_travis = (os.getenv('TRAVIS') == 'true')
|
||||
if is_travis and sys.platform == 'linux2':
|
||||
execute(['sudo', 'apt-get', 'update'])
|
||||
execute(['sudo', 'apt-get', 'install'] + LINUX_DEPS)
|
||||
|
||||
rm_rf(os.path.join(SOURCE_ROOT, 'out'))
|
||||
rm_rf(os.path.join(SOURCE_ROOT, 'node_modules'))
|
||||
|
@ -33,7 +34,14 @@ def main():
|
|||
rm_rf(os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor', 'download',
|
||||
'libchromiumcontent'))
|
||||
|
||||
run_script('bootstrap.py')
|
||||
if is_travis and sys.platform == 'linux2':
|
||||
with scoped_env('CXX', 'g++'):
|
||||
with scoped_env('CC', 'gcc'):
|
||||
run_script('bootstrap.py')
|
||||
run_script('update.py')
|
||||
else:
|
||||
run_script('bootstrap.py')
|
||||
|
||||
run_script('cpplint.py')
|
||||
if sys.platform != 'win32':
|
||||
run_script('pylint.py')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue