| 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 copy | 5 import copy |
| 6 import hashlib | 6 import hashlib |
| 7 import multiprocessing | 7 import multiprocessing |
| 8 import os.path | 8 import os.path |
| 9 import re | 9 import re |
| 10 import signal | 10 import signal |
| (...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 913 elif self.flavor == 'win': | 913 elif self.flavor == 'win': |
| 914 manifest_name = self.GypPathToUniqueOutput( | 914 manifest_name = self.GypPathToUniqueOutput( |
| 915 self.ComputeOutputFileName(spec)) | 915 self.ComputeOutputFileName(spec)) |
| 916 ldflags, manifest_files = self.msvs_settings.GetLdflags(config_name, | 916 ldflags, manifest_files = self.msvs_settings.GetLdflags(config_name, |
| 917 self.GypPathToNinja, self.ExpandSpecial, manifest_name, is_executable) | 917 self.GypPathToNinja, self.ExpandSpecial, manifest_name, is_executable) |
| 918 self.WriteVariableList('manifests', manifest_files) | 918 self.WriteVariableList('manifests', manifest_files) |
| 919 else: | 919 else: |
| 920 ldflags = config.get('ldflags', []) | 920 ldflags = config.get('ldflags', []) |
| 921 if is_executable and len(solibs): | 921 if is_executable and len(solibs): |
| 922 ldflags.append('-Wl,-rpath=\$$ORIGIN/lib/') | 922 ldflags.append('-Wl,-rpath=\$$ORIGIN/lib/') |
| 923 ldflags.append('-Wl,-rpath-link=lib/') |
| 923 self.WriteVariableList('ldflags', | 924 self.WriteVariableList('ldflags', |
| 924 gyp.common.uniquer(map(self.ExpandSpecial, | 925 gyp.common.uniquer(map(self.ExpandSpecial, |
| 925 ldflags))) | 926 ldflags))) |
| 926 | 927 |
| 927 libraries = gyp.common.uniquer(map(self.ExpandSpecial, | 928 libraries = gyp.common.uniquer(map(self.ExpandSpecial, |
| 928 spec.get('libraries', []))) | 929 spec.get('libraries', []))) |
| 929 if self.flavor == 'mac': | 930 if self.flavor == 'mac': |
| 930 libraries = self.xcode_settings.AdjustLibraries(libraries) | 931 libraries = self.xcode_settings.AdjustLibraries(libraries) |
| 931 elif self.flavor == 'win': | 932 elif self.flavor == 'win': |
| 932 libraries = self.msvs_settings.AdjustLibraries(libraries) | 933 libraries = self.msvs_settings.AdjustLibraries(libraries) |
| (...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1781 arglists.append( | 1782 arglists.append( |
| 1782 (target_list, target_dicts, data, params, config_name)) | 1783 (target_list, target_dicts, data, params, config_name)) |
| 1783 pool.map(CallGenerateOutputForConfig, arglists) | 1784 pool.map(CallGenerateOutputForConfig, arglists) |
| 1784 except KeyboardInterrupt, e: | 1785 except KeyboardInterrupt, e: |
| 1785 pool.terminate() | 1786 pool.terminate() |
| 1786 raise e | 1787 raise e |
| 1787 else: | 1788 else: |
| 1788 for config_name in config_names: | 1789 for config_name in config_names: |
| 1789 GenerateOutputForConfig(target_list, target_dicts, data, params, | 1790 GenerateOutputForConfig(target_list, target_dicts, data, params, |
| 1790 config_name) | 1791 config_name) |
| OLD | NEW |