summaryrefslogtreecommitdiffstats
path: root/native_client_sdk/src
diff options
context:
space:
mode:
authornoelallen@chromium.org <noelallen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-16 05:32:56 +0000
committernoelallen@chromium.org <noelallen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-16 05:32:56 +0000
commitac72435bef6ab9da8d954275d6a8233f770e502c (patch)
tree8c0c2b7d180de4f5dadb7c2bbab0fe749286545d /native_client_sdk/src
parent27f1a42624c2ee9132d622f76a4086f786015e60 (diff)
downloadchromium_src-ac72435bef6ab9da8d954275d6a8233f770e502c.zip
chromium_src-ac72435bef6ab9da8d954275d6a8233f770e502c.tar.gz
chromium_src-ac72435bef6ab9da8d954275d6a8233f770e502c.tar.bz2
Rerun gclient runhooks to get toolchain.
We need to rerun runhooks to make sure that we got the toolchain. R=bradnelson@chromium.org BUG=11292 Review URL: http://codereview.chromium.org/9405037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src')
-rwxr-xr-xnative_client_sdk/src/build_tools/buildbot_run.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/native_client_sdk/src/build_tools/buildbot_run.py b/native_client_sdk/src/build_tools/buildbot_run.py
index 5ce72f5..a7bdf17 100755
--- a/native_client_sdk/src/build_tools/buildbot_run.py
+++ b/native_client_sdk/src/build_tools/buildbot_run.py
@@ -481,7 +481,7 @@ def main(args):
arch = 'x86'
builder_name = os.getenv('BUILDBOT_BUILDERNAME','')
- if builder_name.find('pnacl') >= 0 and builder_name.find('pnacl') >= 0:
+ if builder_name.find('pnacl') >= 0 and builder_name.find('sdk') >= 0:
options.pnacl = True
if options.pnacl:
@@ -497,6 +497,7 @@ def main(args):
skip_build = skip
skip_tar = skip or options.skip_tar
+
if options.examples: skip_examples = False
if options.update: skip_update = False
@@ -510,6 +511,9 @@ def main(args):
pepper_ver = options.release
print 'Building PEPPER %s at %s' % (pepper_ver, clnumber)
+ if not skip_build:
+ BuildStep('Rerun hooks to get toolchains')
+ Run(['gclient', 'runhooks'], cwd=SRC_DIR, shell=True)
BuildStep('Clean Pepper Dir')
pepperdir = os.path.join(SRC_DIR, 'out', 'pepper_' + pepper_ver)