summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/common.gypi2
-rwxr-xr-xbuild/download_nacl_toolchains.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 8b27923..6d53044 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -626,7 +626,7 @@
'conditions': [
# Used to disable Native Client at compile time, for platforms where it
# isn't supported (ARM)
- ['target_arch=="arm" or chromeos==1', {
+ ['target_arch=="arm"', {
'disable_nacl%': 1,
}, {
'disable_nacl%': 0,
diff --git a/build/download_nacl_toolchains.py b/build/download_nacl_toolchains.py
index f988891..580f410 100755
--- a/build/download_nacl_toolchains.py
+++ b/build/download_nacl_toolchains.py
@@ -15,10 +15,10 @@ def Main(args):
args = [
'--nacl-newlib-only',
'--file-hash', 'linux_x86_newlib',
- '8337d5ec327d857a49b500723ec9b792f4973abc',
+ '1deb316302fde89a2200dff6550cf510ae90b89b',
'--base-url', ('https://commondatastorage.googleapis.com/'
'nativeclient-archive2/special_chromeos'),
- '--x86-version', '6561',
+ '--x86-version', '7258',
]
print 'NOTE: Special handling for chromeos'
print 'Running with these argument instead:'