| Index: native_client_sdk/src/build_tools/build_sdk.py
|
| diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
|
| index 04ef24645116cd1bf02f5ff2f2e39bfde28f6a5f..ffc7c76941600192777a91fdb4a759628004119b 100755
|
| --- a/native_client_sdk/src/build_tools/build_sdk.py
|
| +++ b/native_client_sdk/src/build_tools/build_sdk.py
|
| @@ -547,11 +547,13 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets,
|
| print '%s="%s"' % (key, value)
|
| gyp_generator_flags = ['-G', 'output_dir=%s' % (out_dir,)]
|
| gyp_depth = '--depth=.'
|
| - buildbot_common.Run(
|
| - [sys.executable, gyp_py_script, gyp_file, gyp_depth] + \
|
| - gyp_generator_flags,
|
| - cwd=SRC_DIR,
|
| - env=gyp_env)
|
| + cmd = [sys.executable, gyp_py_script, gyp_file, gyp_depth]
|
| + # Hack added to fix M32 branch windows_sdk_multirel bot, without having to
|
| + # branch the native_client repo.
|
| + # TODO(binji): remove after I drover the change to 1700 branch.
|
| + cmd.append('--no-parallel')
|
| + cmd.extend(gyp_generator_flags)
|
| + buildbot_common.Run(cmd, cwd=SRC_DIR, env=gyp_env)
|
| NinjaBuild(targets, out_dir)
|
|
|
|
|
|
|