Don't download the NaCl toolchain if GYP_DEFINES contains disable_nacl=1

build/download_nacl_toolchains.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Shim to run nacl toolchain download script only if there is a nacl dir."""
 
 import os
 import sys
 
 
 def Main(args):
+  # Exit early if disable_nacl=1.
+  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):

[bradn, 2011/12/06 18:36:16]

How about 'disable_nacl=1' in os.environ.get('GYP_DEFINES', '').split(' '):

[jochen (gone - plz use gerrit), 2011/12/06 18:40:51]

I don't feel strongly about this, I just duplicated the chromeos=1 check in the
next line

+    return 0
   # Handle chromeos=1 specially (until its building its own toolchain).
   if 'chromeos=1' in os.environ.get('GYP_DEFINES', ''):
     args = [
       '--nacl-newlib-only',
       '--file-hash', 'linux_x86_newlib',
            '1deb316302fde89a2200dff6550cf510ae90b89b',
       '--base-url', ('https://commondatastorage.googleapis.com/'
                      'nativeclient-archive2/special_chromeos'),
       '--x86-version', '7258',
     ]
@@ skipping 11 matching lines @@
     print 'Skipping NativeClient toolchain download.'
     sys.exit(0)
   sys.path.insert(0, nacl_build_dir)
   import download_toolchains
   download_toolchains.Main(args)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))