| Index: tools/gn.py
|
| diff --git a/tools/gn.py b/tools/gn.py
|
| index b30d7744a9f73e36183d3aad4608d10b7e132334..59142ba5374cd989f9f733729e5fa4c7eaf694a1 100755
|
| --- a/tools/gn.py
|
| +++ b/tools/gn.py
|
| @@ -165,10 +165,8 @@ def to_gn_args(args, mode, arch, target_os):
|
| # TODO(zra): Investigate using clang with these configurations.
|
| # Clang compiles tcmalloc's inline assembly for ia32 on Linux wrong, so we
|
| # don't use clang in that configuration. Thus, we use gcc for ia32 *unless*
|
| - # asan or tsan is specified.
|
| + # a clang-based sanitizer is specified.
|
| has_clang = (host_os != 'win'
|
| - and args.os not in ['android']
|
| - and not gn_args['target_cpu'].startswith('arm')
|
| and not gn_args['target_cpu'].startswith('mips')
|
| and not ((gn_args['target_os'] == 'linux')
|
| and (gn_args['host_cpu'] == 'x86')
|
| @@ -248,7 +246,7 @@ def process_options(args):
|
| if os_name != 'android':
|
| print "Unsupported target os %s" % os_name
|
| return False
|
| - if not HOST_OS in ['linux']:
|
| + if not HOST_OS in ['linux', 'macos']:
|
| print ("Cross-compilation to %s is not supported on host os %s."
|
| % (os_name, HOST_OS))
|
| return False
|
| @@ -367,7 +365,8 @@ def parse_args(args):
|
| type=int,
|
| help='Number of simultaneous GN invocations',
|
| dest='workers',
|
| - default=multiprocessing.cpu_count())
|
| + # Set to multiprocessing.cpu_count() when GN can be run in parallel.
|
| + default=1)
|
|
|
| options = parser.parse_args(args)
|
| if not process_options(options):
|
|
|