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

Merge pull request #6612 from electron/cc-cxx

Browse source 
Do not overwrite CC and CXX in bootstrap
This commit is contained in:
Cheng Zhao 2016-07-26 19:55:25 +09:00 • committed by GitHub
commit 7c1f48808b
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
script/bootstrap.py
View file

@ -65,7 +65,7 @@ def main():
create_chrome_version_h() create_chrome_version_h()
touch_config_gypi() touch_config_gypi()
run_update(defines, args.msvs, args.disable_clang, args.clang_dir) run_update(defines, args.msvs)
update_electron_modules('spec', args.target_arch) update_electron_modules('spec', args.target_arch)
@ -251,19 +251,14 @@ def touch_config_gypi():
f.write(content) f.write(content)
def run_update(defines, msvs, disable_clang, clang_dir): def run_update(defines, msvs):
env = os.environ.copy()
if not disable_clang and clang_dir == '':
# Build with prebuilt clang.
set_clang_env(env)
args = [sys.executable, os.path.join(SOURCE_ROOT, 'script', 'update.py')] args = [sys.executable, os.path.join(SOURCE_ROOT, 'script', 'update.py')]
if defines: if defines:
args += ['--defines', defines] args += ['--defines', defines]
if msvs: if msvs:
args += ['--msvs'] args += ['--msvs']
execute_stdout(args, env) execute_stdout(args)
if __name__ == '__main__': if __name__ == '__main__':

7
script/cibuild
View file

@ -35,6 +35,13 @@ def main():
if os.environ.has_key('JANKY_SHA1'): if os.environ.has_key('JANKY_SHA1'):
setup_nodenv() setup_nodenv()
# Ignore the CXX and CC env in CI.
try:
del os.environ['CC']
del os.environ['CXX']
except KeyError:
pass
target_arch = 'x64' target_arch = 'x64'
if os.environ.has_key('TARGET_ARCH'): if os.environ.has_key('TARGET_ARCH'):
target_arch = os.environ['TARGET_ARCH'] target_arch = os.environ['TARGET_ARCH']