| OLD | NEW | 
|---|
| 1 #! -*- python -*- | 1 #! -*- python -*- | 
| 2 # | 2 # | 
| 3 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 3 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be | 
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. | 
| 6 | 6 | 
| 7 """ Main scons script for Native Client SDK builds. | 7 """ Main scons script for Native Client SDK builds. | 
| 8 | 8 | 
| 9 Do not invoke this script directly, but instead use the scons or scons.bat | 9 Do not invoke this script directly, but instead use the scons or scons.bat | 
| 10 wrapper function.  E.g. | 10 wrapper function.  E.g. | 
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 94     CPPDEFINES = [ | 94     CPPDEFINES = [ | 
| 95       'BOOST_ALL_NO_LIB', | 95       'BOOST_ALL_NO_LIB', | 
| 96     ], | 96     ], | 
| 97     NACL_TOOLCHAIN_ROOTS = { | 97     NACL_TOOLCHAIN_ROOTS = { | 
| 98         ('x86', 'newlib'): | 98         ('x86', 'newlib'): | 
| 99           build_utils.NormalizeToolchain(arch='x86', variant='newlib'), | 99           build_utils.NormalizeToolchain(arch='x86', variant='newlib'), | 
| 100         ('x86', 'glibc'): | 100         ('x86', 'glibc'): | 
| 101           build_utils.NormalizeToolchain(arch='x86', variant='glibc'), | 101           build_utils.NormalizeToolchain(arch='x86', variant='glibc'), | 
| 102     }, | 102     }, | 
| 103     ROOT_DIR = os.path.abspath(os.getcwd()), | 103     ROOT_DIR = os.path.abspath(os.getcwd()), | 
| 104     IS_WINDOWS = sys.platform in ['cygwin', 'win32'], | 104     IS_WINDOWS = (sys.platform in ['cygwin', 'win32'] and | 
|  | 105                   '64' in os.environ.get('PROCESSOR_ARCHITECTURE', '') or | 
|  | 106                   '64' in os.environ.get('PROCESSOR_ARCHITEW6432', '')), | 
| 105     IS_LINUX = sys.platform == 'linux2', | 107     IS_LINUX = sys.platform == 'linux2', | 
| 106     IS_MAC = sys.platform == 'darwin', | 108     IS_MAC = sys.platform == 'darwin', | 
| 107     JOB_COUNT = GetOption('num_jobs') | 109     JOB_COUNT = GetOption('num_jobs') | 
| 108 ) | 110 ) | 
| 109 | 111 | 
| 110 # It is possible to override these values on the command line by typing | 112 # It is possible to override these values on the command line by typing | 
| 111 # something like this: | 113 # something like this: | 
| 112 #   PYTHON=/path/to/my/python | 114 #   PYTHON=/path/to/my/python | 
| 113 base_env.SetDefault( | 115 base_env.SetDefault( | 
| 114     PYTHON = ARGUMENTS.get('PYTHON', 'python'), | 116     PYTHON = ARGUMENTS.get('PYTHON', 'python'), | 
| (...skipping 940 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1055 | 1057 | 
| 1056 build_env.AddMethod(TestVSSolution) | 1058 build_env.AddMethod(TestVSSolution) | 
| 1057 | 1059 | 
| 1058 | 1060 | 
| 1059 # ---------------------------------------------------------------------------- | 1061 # ---------------------------------------------------------------------------- | 
| 1060 BuildComponents(environment_list) | 1062 BuildComponents(environment_list) | 
| 1061 | 1063 | 
| 1062 # Require specifying an explicit target only when not cleaning | 1064 # Require specifying an explicit target only when not cleaning | 
| 1063 if not GetOption('clean'): | 1065 if not GetOption('clean'): | 
| 1064   Default(None) | 1066   Default(None) | 
| OLD | NEW | 
|---|