Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Side by Side Diff: build/build_nexe.py

Issue 959003005: Use goma by default on Windows. (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 """NEXE building script 6 """NEXE building script
7 7
8 This module will take a set of source files, include paths, library paths, and 8 This module will take a set of source files, include paths, library paths, and
9 additional arguments, and use them to build. 9 additional arguments, and use them to build.
10 """ 10 """
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 path[len(cygdrive)] + ':' + path[len(cygdrive)+1:]) 397 path[len(cygdrive)] + ':' + path[len(cygdrive)+1:])
398 elif path.startswith('/libexec/'): 398 elif path.startswith('/libexec/'):
399 path = os.path.normpath(os.path.join(self.toolchain, path[1:])) 399 path = os.path.normpath(os.path.join(self.toolchain, path[1:]))
400 return path 400 return path
401 401
402 def GetGomaConfig(self, gomadir, arch, toolname): 402 def GetGomaConfig(self, gomadir, arch, toolname):
403 """Returns a goma config dictionary if goma is available or {}.""" 403 """Returns a goma config dictionary if goma is available or {}."""
404 404
405 # Start goma support from os/arch/toolname that have been tested. 405 # Start goma support from os/arch/toolname that have been tested.
406 # Set NO_NACL_GOMA=true to force to avoid using goma. 406 # Set NO_NACL_GOMA=true to force to avoid using goma.
407 default_no_nacl_goma = True if pynacl.platform.IsWindows() else False 407 default_no_nacl_goma = False
408 if (arch not in ['x86-32', 'x86-64', 'pnacl'] 408 if (arch not in ['x86-32', 'x86-64', 'pnacl']
409 or toolname not in ['newlib', 'glibc'] 409 or toolname not in ['newlib', 'glibc']
410 or IsEnvFlagTrue('NO_NACL_GOMA', default=default_no_nacl_goma) 410 or IsEnvFlagTrue('NO_NACL_GOMA', default=default_no_nacl_goma)
411 or IsEnvFlagTrue('GOMA_DISABLED')): 411 or IsEnvFlagTrue('GOMA_DISABLED')):
412 return {} 412 return {}
413 413
414 goma_config = {} 414 goma_config = {}
415 gomacc_base = 'gomacc.exe' if pynacl.platform.IsWindows() else 'gomacc' 415 gomacc_base = 'gomacc.exe' if pynacl.platform.IsWindows() else 'gomacc'
416 # Search order of gomacc: 416 # Search order of gomacc:
417 # --gomadir command argument -> GOMA_DIR env. -> PATH env. 417 # --gomadir command argument -> GOMA_DIR env. -> PATH env.
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
985 if build is not None: 985 if build is not None:
986 build.EmitDeferredLog() 986 build.EmitDeferredLog()
987 return 1 987 return 1
988 except: 988 except:
989 if build is not None: 989 if build is not None:
990 build.EmitDeferredLog() 990 build.EmitDeferredLog()
991 raise 991 raise
992 992
993 if __name__ == '__main__': 993 if __name__ == '__main__':
994 sys.exit(Main(sys.argv)) 994 sys.exit(Main(sys.argv))
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698