| OLD | NEW | 
|---|
| 1 # Copyright (c) 2013 Google Inc. All rights reserved. | 1 # Copyright (c) 2013 Google Inc. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 import collections | 5 import collections | 
| 6 import copy | 6 import copy | 
| 7 import hashlib | 7 import hashlib | 
| 8 import json | 8 import json | 
| 9 import multiprocessing | 9 import multiprocessing | 
| 10 import os.path | 10 import os.path | 
| (...skipping 1697 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1708   gyp.common.CopyTool(flavor, toplevel_build) | 1708   gyp.common.CopyTool(flavor, toplevel_build) | 
| 1709 | 1709 | 
| 1710   # Grab make settings for CC/CXX. | 1710   # Grab make settings for CC/CXX. | 
| 1711   # The rules are | 1711   # The rules are | 
| 1712   # - The priority from low to high is gcc/g++, the 'make_global_settings' in | 1712   # - The priority from low to high is gcc/g++, the 'make_global_settings' in | 
| 1713   #   gyp, the environment variable. | 1713   #   gyp, the environment variable. | 
| 1714   # - If there is no 'make_global_settings' for CC.host/CXX.host or | 1714   # - If there is no 'make_global_settings' for CC.host/CXX.host or | 
| 1715   #   'CC_host'/'CXX_host' enviroment variable, cc_host/cxx_host should be set | 1715   #   'CC_host'/'CXX_host' enviroment variable, cc_host/cxx_host should be set | 
| 1716   #   to cc/cxx. | 1716   #   to cc/cxx. | 
| 1717   if flavor == 'win': | 1717   if flavor == 'win': | 
| 1718     # Overridden by local arch choice in the use_deps case. |  | 
| 1719     # Chromium's ffmpeg c99conv.py currently looks for a 'cc =' line in |  | 
| 1720     # build.ninja so needs something valid here. http://crbug.com/233985 |  | 
| 1721     cc = 'cl.exe' | 1718     cc = 'cl.exe' | 
| 1722     cxx = 'cl.exe' | 1719     cxx = 'cl.exe' | 
| 1723     ld = 'link.exe' | 1720     ld = 'link.exe' | 
| 1724     ld_host = '$ld' | 1721     ld_host = '$ld' | 
| 1725   else: | 1722   else: | 
| 1726     cc = 'cc' | 1723     cc = 'cc' | 
| 1727     cxx = 'c++' | 1724     cxx = 'c++' | 
| 1728     ld = '$cc' | 1725     ld = '$cc' | 
| 1729     ldxx = '$cxx' | 1726     ldxx = '$cxx' | 
| 1730     ld_host = '$cc_host' | 1727     ld_host = '$cc_host' | 
| (...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2208           arglists.append( | 2205           arglists.append( | 
| 2209               (target_list, target_dicts, data, params, config_name)) | 2206               (target_list, target_dicts, data, params, config_name)) | 
| 2210         pool.map(CallGenerateOutputForConfig, arglists) | 2207         pool.map(CallGenerateOutputForConfig, arglists) | 
| 2211       except KeyboardInterrupt, e: | 2208       except KeyboardInterrupt, e: | 
| 2212         pool.terminate() | 2209         pool.terminate() | 
| 2213         raise e | 2210         raise e | 
| 2214     else: | 2211     else: | 
| 2215       for config_name in config_names: | 2212       for config_name in config_names: | 
| 2216         GenerateOutputForConfig(target_list, target_dicts, data, params, | 2213         GenerateOutputForConfig(target_list, target_dicts, data, params, | 
| 2217                                 config_name) | 2214                                 config_name) | 
| OLD | NEW | 
|---|