Index: gyp/common_conditions.gypi |
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi |
index 71dca269d080f1e4d2497a52097b52ddd96f27f6..175b8b09edc41bbf9030e9517a17fac302c12a99 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', |
}], |