diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-22 20:05:35 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-22 20:05:35 +0000 |
| commit | d10ec40031e3c3517e0f3e494bae3c0438db24bd (patch) | |
| tree | 5d10760ed42d3903a3fd5b6cd4a906adc831dda1 /gyp/common_conditions.gypi | |
| parent | d7ee4b6699f8b3a35410c51348bd07c6c8df20b8 (diff) | |
gyp: only include windows *_x64 targets if GYP_GENERATORS includes ninja
BUG=skia:2442
R=caryclark@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/247143003
git-svn-id: http://skia.googlecode.com/svn/trunk@14313 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp/common_conditions.gypi')
| -rw-r--r-- | gyp/common_conditions.gypi | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 71dca269d0..175b8b09ed 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -91,6 +91,8 @@ }, }, }, + }, + 'conditions' : [ # Gyp's ninja generator depends on these specially named # configurations to build 64-bit on Windows. # See http://skbug.com/2348 @@ -98,17 +100,22 @@ # We handle the 64- vs 32-bit variations elsewhere, so I think it's # OK for us to just make these inherit non-archwidth-specific # configurations without modification. - 'Debug_x64': { - 'inherit_from': ['Debug'], - }, - 'Release_x64': { - 'inherit_from': ['Release'], - }, - 'Release_Developer_x64': { - 'inherit_from': ['Release_Developer'], - }, - }, - 'conditions' : [ + # + # See http://skbug.com/2442 : These targets cause problems in the + # MSVS build, so only include them if gyp is generating a ninja build. + [ '"ninja" in "<!(echo %GYP_GENERATORS%)"', { + 'configurations': { + 'Debug_x64': { + 'inherit_from': ['Debug'], + }, + 'Release_x64': { + 'inherit_from': ['Release'], + }, + 'Release_Developer_x64': { + 'inherit_from': ['Release_Developer'], + }, + }, + }], [ 'skia_arch_width == 64', { 'msvs_configuration_platform': 'x64', }], |