diff options
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 94d9294..6226c32 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -89,7 +89,12 @@ '../ui/compositor/compositor.gyp:compositor', ], }], - ['OS=="win" and target_arch=="ia32"', { + ['OS=="win" and target_arch=="ia32" and MSVS_VERSION!="2013"', { + # TODO(scottmg): The assembler is very broken in VS2013 and + # crashes on the generated .asm file, so disable this for now. + # This should be revisited after a VS2013 update. See + # http://crbug.com/288948. + # # Add a dependency to custom import library for user32 delay # imports only in x86 builds. 'dependencies': [ @@ -149,7 +154,7 @@ 'OutputFile': '$(OutDir)\\initial\\chrome.dll', 'UseLibraryDependencyInputs': "true", }], - ['target_arch=="ia32"', { + ['target_arch=="ia32" and MSVS_VERSION!="2013"', { # Link against the XP-constrained user32 import library # instead of the platform-SDK provided one to avoid # inadvertently taking dependencies on post-XP user32 |