diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 23:15:37 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 23:15:37 +0000 |
| commit | f4a69f439e88e1863b9c2700b9caf594e6f3589d (patch) | |
| tree | e7ea7918733a62455b08ebc13844310bc63d40c6 /chrome/chrome_dll.gypi | |
| parent | ad25b8b5a2f674be6b02c2085538330fcfb7c97e (diff) | |
| download | chromium_src-f4a69f439e88e1863b9c2700b9caf594e6f3589d.zip chromium_src-f4a69f439e88e1863b9c2700b9caf594e6f3589d.tar.gz chromium_src-f4a69f439e88e1863b9c2700b9caf594e6f3589d.tar.bz2 | |
Disable custom user32 custom imports on VS2013
The assembler is very broken so it crashes on the stubs file.
We could potentially use yasm or something instead of the MS
assembler if they don't get this fixed by final release.
R=siggi@chromium.org
BUG=288948
Review URL: https://codereview.chromium.org/27072004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228797 0039d316-1c4b-4281-b951-d872f2087c98
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 |