Index: build/download_nacl_toolchains.py |
diff --git a/build/download_nacl_toolchains.py b/build/download_nacl_toolchains.py |
index 2fdfa00f37c7fa9f72db6ed79c3c88ca25ae74f2..d3959310834536f6ae135263be32674a72e99e05 100755 |
--- a/build/download_nacl_toolchains.py |
+++ b/build/download_nacl_toolchains.py |
@@ -13,6 +13,7 @@ def Main(args): |
# Exit early if disable_nacl=1. |
if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''): |
return 0 |
+ |
script_dir = os.path.dirname(os.path.abspath(__file__)) |
src_dir = os.path.dirname(script_dir) |
nacl_dir = os.path.join(src_dir, 'native_client') |
@@ -34,8 +35,16 @@ def Main(args): |
# gclient sync time for developers, or standard Chrome bots. |
if '--optional-pnacl' in args: |
args.remove('--optional-pnacl') |
+ # By default we don't use pNaCl toolchain yet, unless on ARM, where |
jvoung - send to chromium...
2012/03/26 17:09:55
s/pNaCl/PNaCl/
|
+ # there is no other toolchain to build untrusted code at the moment. |
+ # So analyze is we're building for ARM, or on SDK buildbot. |
jvoung - send to chromium...
2012/03/26 17:09:55
s/analyze is/analyze if/
|
+ use_pnacl = False |
+ if 'target_arch=arm' in os.environ.get('GYP_DEFINES', ''): |
+ use_pnacl = True |
buildbot_name = os.environ.get('BUILDBOT_BUILDERNAME', '') |
if buildbot_name.find('pnacl') >= 0 and buildbot_name.find('sdk') >= 0: |
+ use_pncal = True |
jvoung - send to chromium...
2012/03/26 17:09:55
s/use_pncal/use_pnacl/
|
+ if use_pnacl: |
print '\n*** DOWNLOADING PNACL TOOLCHAIN ***\n' |
else: |
args.append('--no-pnacl') |
@@ -46,4 +55,3 @@ def Main(args): |
if __name__ == '__main__': |
sys.exit(Main(sys.argv[1:])) |
- |