From 58d094945371642ede841e9262155eb42d9364a6 Mon Sep 17 00:00:00 2001
From: "binji@chromium.org"
 <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 22 Nov 2013 00:12:21 +0000
Subject: [NaCl SDK] Turn off parallel GYP when building nacl_sdk.

This will make it easier to drover a change to the 1700 branch, instead of
having to branch native_client to get the real fix (r12324).

BUG=319564
R=sbc@chromium.org

Review URL: https://codereview.chromium.org/62523005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236644 0039d316-1c4b-4281-b951-d872f2087c98
---
 native_client_sdk/src/build_tools/build_sdk.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'native_client_sdk/src')

diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 04ef246..ffc7c76 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)
 
 
-- 
cgit v1.1