Permalink
Browse files

Handle pnacl toolchain revision

The chromium/src/DEPS file now tracks the pnacl toolchain revision too.
Update it as well under -t.
  • Loading branch information...
1 parent 4a35b35 commit 46f98c80b54f421e255eb23560549b3ebdfc5055 @frobtech frobtech committed Feb 8, 2012
Showing with 8 additions and 4 deletions.
  1. +8 −4 nacl_deps_bump.py
View
@@ -161,9 +161,12 @@ def Main():
GetDepsKey(nacl_deps, 'tools_rev'))
if options.toolchain:
- toolchain_rev = GetDepsKey(nacl_deps, 'x86_toolchain_version')
+ x86_toolchain_rev = GetDepsKey(nacl_deps, 'x86_toolchain_version')
deps_data = SetDepsKey(deps_data, 'nacl_toolchain_revision',
- toolchain_rev)
+ x86_toolchain_rev)
+ pnacl_toolchain_rev = GetDepsKey(nacl_deps, 'pnacl_toolchain_version')
+ deps_data = SetDepsKey(deps_data, 'pnacl_toolchain_revision',
+ pnacl_toolchain_rev)
sys.path.insert(0, 'native_client/build')
import download_toolchains
@@ -172,10 +175,11 @@ def Main():
# Mock up the optparse options object GetUpdatedDEPS expects.
class DownloadOptions(object):
nacl_newlib_only = False
- no_pnacl = True
+ no_pnacl = False
no_arm_trusted = True
base_url = toolchainbinaries.BASE_DOWNLOAD_URL
- x86_version = toolchain_rev
+ x86_version = x86_toolchain_rev
+ pnacl_version = pnacl_toolchain_rev
toolchain_deps = download_toolchains.GetUpdatedDEPS(DownloadOptions())
for key, value in toolchain_deps.iteritems():

0 comments on commit 46f98c8

Please sign in to comment.