Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 55c380727706e21c6fe41b14b1c537f7dc9a870e..e812f294a9e97c4e9c4d48e8517d7049015b79f6 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1081,14 +1081,6 @@ |
# .obj files. |
'incremental_chrome_dll%': 1, |
}], |
- # Whether to use multiple cores to compile with visual studio. This is |
- # optional because it sometimes causes corruption on VS 2005. |
- # It is on by default on VS 2008 and off on VS 2005. |
- ['MSVS_VERSION=="2005"', { |
- 'msvs_multi_core_compile%': 0, |
- },{ |
- 'msvs_multi_core_compile%': 1, |
- }], |
# Don't do incremental linking for large modules on 32-bit. |
['MSVS_OS_BITS==32', { |
'msvs_large_module_debug_link_mode%': '1', # No |
@@ -3199,6 +3191,7 @@ |
], |
'msvs_settings': { |
'VCCLCompilerTool': { |
+ 'AdditionalOptions': ['/MP'], |
'MinimalRebuild': 'false', |
'BufferSecurityCheck': 'true', |
'EnableFunctionLevelLinking': 'true', |
@@ -3207,12 +3200,6 @@ |
'WarnAsError': 'true', |
'DebugInformationFormat': '3', |
'conditions': [ |
- ['msvs_multi_core_compile', { |
- 'AdditionalOptions': ['/MP'], |
- }], |
- ['MSVS_VERSION=="2005e"', { |
- 'AdditionalOptions': ['/w44068'], # Unknown pragma to 4 (ATL) |
- }], |
['component=="shared_library"', { |
'ExceptionHandling': '1', # /EHsc |
}, { |