Chromium Code Reviews| Index: pylib/gyp/msvs_emulation.py |
| diff --git a/pylib/gyp/msvs_emulation.py b/pylib/gyp/msvs_emulation.py |
| index 3435bbc524e64a8a70c913ecd2fd40314d0a1408..53e776d6ad6ff0af5b1f19492753348eccd43689 100644 |
| --- a/pylib/gyp/msvs_emulation.py |
| +++ b/pylib/gyp/msvs_emulation.py |
| @@ -317,15 +317,20 @@ class MsvsSettings(object): |
| output_file, config=config)) |
| return output_file |
| - def GetPDBName(self, config, expand_special): |
| - """Gets the explicitly overridden pdb name for a target or returns None |
| - if it's not overridden.""" |
| + def GetPDBName(self, config, expand_special, default=None): |
| + """Gets the explicitly overridden pdb name for a target or returns |
| + default=None if it's not overridden, or if no pdb will be generated.""" |
| config = self._TargetConfig(config) |
| output_file = self._Setting(('VCLinkerTool', 'ProgramDatabaseFile'), config) |
| - if output_file: |
| - output_file = expand_special(self.ConvertVSMacros( |
| - output_file, config=config)) |
| - return output_file |
| + generate_debug_info = self._Setting( |
| + ('VCLinkerTool', 'GenerateDebugInformation'), config) |
| + if generate_debug_info: |
| + if output_file: |
| + return expand_special(self.ConvertVSMacros(output_file, config=config)) |
|
Nico
2014/01/08 21:44:13
This won't match the /PDB: flag passed to the link
|
| + else: |
| + return default |
| + else: |
| + return None |
| def GetCflags(self, config): |
| """Returns the flags that need to be added to .c and .cc compilations.""" |